Fix upstream merge conflict on 9dbdbd0c8480
Merging upstream commit 9dbdbd0c8480 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 0bde52052db0ffd04ebdfbb50822c95c8d08d389 && \
hg topic upstream-merge && \
hg merge 9dbdbd0c848064a46fb31e38b9f06796382d1b91