Fix upstream merge conflict on ecfb7f6070ec
Merging upstream commit ecfb7f6070ec 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 6c35da55cf9d00aeb4d7fafb82d255df43ce00f7 && \
hg topic upstream-merge && \
hg merge ecfb7f6070ecc1d88ab8c1b90a62e28ede4e29da