Fix upstream merge conflict on cfff1735aea6
Merging upstream commit cfff1735aea6 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 0b335d942690e73cb8a445144758a716704a225e && \
hg topic upstream-merge && \
hg merge cfff1735aea69085a1f4272fd7647df9e87552fe