Fix upstream merge conflict on 8d4a6d8223ff
Merging upstream commit 8d4a6d8223ff 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 26b9c42429861a993001fee3555d41c255bf68fd && \
hg topic upstream-merge && \
hg merge 8d4a6d8223ff24cd4f29d725cdfd71ee9e8f088f