Fix upstream merge conflict on 516a6b863530
Merging upstream commit 516a6b863530 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 5e50bd7522ab7e052d82e08015dc9cd4474a7c77 && \
hg topic upstream-merge && \
hg merge 516a6b86353041af39a17b5e8267f811d174c6ef