Fix upstream merge conflict on 62369287fdb9
Merging upstream commit 62369287fdb9 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 7dac744695919c931ab81a6bc646f687198d3c9c && \
hg topic upstream-merge && \
hg merge 62369287fdb992bf91179cf6df8baa5c61658bde