Fix upstream merge conflict on a19ac16b4cac
Merging upstream commit a19ac16b4cac 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 ca7d88ad2c64e6a34b487b95bb4e74adfe3138c5 && \
hg topic upstream-merge && \
hg merge a19ac16b4cac9df3d271846a2beff4b928db1c5a