Fix upstream merge conflict on e6659021ea86
Merging upstream commit e6659021ea86 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 be34ddbb52d9112d1843418bebc8b75ae58162f7 && \
hg topic upstream-merge && \
hg merge e6659021ea860e82909993099776ebd64b4180ed