Fix upstream merge conflict on 3eb0cea9fe3d
Merging upstream commit 3eb0cea9fe3d 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 259aedb5e168c9e0b31f1da823904993ba1f151b && \
hg topic upstream-merge && \
hg merge 3eb0cea9fe3d2f30385fc0708fa70d5299d3983b