Fix upstream merge conflict on e65611ffe625
Merging upstream commit e65611ffe625 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 d003c4132cad7bf8819a887645462f90d24e4b4b && \
hg topic upstream-merge && \
hg merge e65611ffe62556ce571c2ebf6198728bdc938bc4