Fix upstream merge conflict on c92d73c60b5f
Merging upstream commit c92d73c60b5f gives a conflict.
A human being has to perform merge and resolution for the automatic merge process to resume.
Command for clean conflict reproduction:
hg pull
hg --config command.update.check=abort update e6db19c90659fe7f0bb70cc6c49825680f7d9d41 && \
hg topic upstream-merge && \
hg merge c92d73c60b5f9db5447104d33cfa965bb2cb5687