Fix upstream merge conflict on 4a540a769ba8
Merging upstream commit 4a540a769ba8 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 6d0b979dddb60a69fe5f850d1f4cc6bfc5b3245e && \
hg topic upstream-merge && \
hg merge 4a540a769ba8a24d655e80a77e8981db61111a4a