Fix upstream merge conflict on 06cd2e6ac3ff
Merging upstream commit 06cd2e6ac3ff 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 c73b6e54da9156b515754de218b4fffb46245500 && \
hg topic upstream-merge && \
hg merge 06cd2e6ac3ff2344b631dbf0ae8507e6723a0c14