Fix upstream merge conflict on 504745171021
Merging upstream commit 504745171021 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 82bb69d2f195798995f864041f3d0a399f43f879 && \
hg topic upstream-merge && \
hg merge 5047451710210062ddc6a9dab33da6ad2b6092e9