Fix upstream merge conflict on ce06751b786c
Merging upstream commit ce06751b786c 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 d946864420876b883b992e2b4ff90d0cae1bd2d9 && \
hg topic upstream-merge && \
hg merge ce06751b786cb3bf2098f37cfa72002ccd949ba3