Fix upstream merge conflict on 7204e24a037d
Merging upstream commit 7204e24a037d 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 c0e6161f9918d3cb9f192a6d382c86ed616d36bb && \
hg topic upstream-merge && \
hg merge 7204e24a037d39c71854dd470b19f67c4fb5e726