Fix upstream merge conflict on c7aaf99c7313
Merging upstream commit c7aaf99c7313 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 8762f94a9851139bdaa3fbcc96ae88f4542d2f6c && \
hg topic upstream-merge && \
hg merge c7aaf99c7313f09fd8f6fa3186de05d8655f801b