Fix upstream merge conflict on 2b0173081489
Merging upstream commit 2b0173081489 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 5b4a16de46e1cf46fa5ebf3f043ffc0f6854c7a2 && \
hg topic upstream-merge && \
hg merge 2b01730814899c032daa6435a0f0df16b3750c56