Fix upstream merge conflict on db12001c39a8
Merging upstream commit db12001c39a8 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 adf2c25ede99aa80708130050bcddf0b67fe42cf && \
hg topic upstream-merge && \
hg merge db12001c39a84332359f35efe6913248c5ec5eaa