Fix upstream merge conflict on e3ca0c2c3d82
Merging upstream commit e3ca0c2c3d82 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 4d9a7ed0441443ab3df0ee9acf3cc22203e05bbb && \
hg topic upstream-merge && \
hg merge e3ca0c2c3d82bcbd2166cc63b6761198ffd02225