Fix upstream merge conflict on 216ea34a6f9f
Merging upstream commit 216ea34a6f9f 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 407d1225e550e132806c2f66ba15f8743b31b78b && \
hg topic upstream-merge && \
hg merge 216ea34a6f9fa09389e3efc8ece80784cc6bf058