Fix upstream merge conflict on 2f5d77be647e
Merging upstream commit 2f5d77be647e 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 3bfff2ffcacb5bef7971942ff00e69883f47e682 && \
hg topic upstream-merge && \
hg merge 2f5d77be647e482304a100ffe4fb4058f87c2293