Fix upstream merge conflict on 6fadf42f39c4
Merging upstream commit 6fadf42f39c4 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 2ed799d1242007a22362aabca2dd996909ba68ba && \
hg topic upstream-merge && \
hg merge 6fadf42f39c4dedde110e292c9c3eb101fb31127