Fix upstream merge conflict on b0a2cb20eff9
Merging upstream commit b0a2cb20eff9 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 b77c76c25b9ec149cdffad8c1094e147e345e7ed && \
hg topic upstream-merge && \
hg merge b0a2cb20eff91e38933fbe4d7fabb792a5c50224