Fix upstream merge conflict on f0eefccddc1e
Merging upstream commit f0eefccddc1e 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 b70fb51f710317543d82a3d4eb9870405c72d6c1 && \
hg topic upstream-merge && \
hg merge f0eefccddc1e0a551c742c25879719f24f28c78e