Fix upstream merge conflict on 57022a6e7767
Merging upstream commit 57022a6e7767 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 d0362ec942eec0ffd73d39451c030a0615559630 && \
hg topic upstream-merge && \
hg merge 57022a6e77675d69ae36bd9ec58ca45d2e413e03