Fix upstream merge conflict on 3f31520d1df3
Merging upstream commit 3f31520d1df3 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 69f71d042529411bf170c92d8aa5732da1ea1b1f && \
hg topic upstream-merge && \
hg merge 3f31520d1df36d6e36bcb1b4053bebb5ee3a5734