Fix upstream merge conflict on b4d4af16fc61
Merging upstream commit b4d4af16fc61 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 a009f0aee29d9fc859c7c3b2809d195087dddf44 && \
hg topic upstream-merge && \
hg merge b4d4af16fc61ce566c74c679c1fb9cbd134c9fbe