Fix upstream merge conflict on 302222c9bad8
Merging upstream commit 302222c9bad8 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 1a700dbf1211e507ff8edffbd96e0f80df344130 && \
hg topic upstream-merge && \
hg merge 302222c9bad826a349dba2e667699642185205b2