Fix upstream merge conflict on 871710430307
Merging upstream commit 871710430307 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 f62f028853837b98e0ab689445854e81988415a4 && \
hg topic upstream-merge && \
hg merge 87171043030702034899ff9211c2bb1e9d555c50