Fix upstream merge conflict on 3ff10de327de
Merging upstream commit 3ff10de327de 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 56a07aa03104ffdca6c35d938d8c2d673cf61470 && \
hg topic upstream-merge && \
hg merge 3ff10de327dea4d25611eb7e9237d2faf44b4c90