Fix upstream merge conflict on e6a0b864cd7f
Merging upstream commit e6a0b864cd7f 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 0988960e59db4ae7e8b872bb22e038978d1c4748 && \
hg topic upstream-merge && \
hg merge e6a0b864cd7f1fa39ae72af3666eee7c8dcd2131