Fix upstream merge conflict on 5a8661f17ee3
Merging upstream commit 5a8661f17ee3 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 cad0fe55bd77f807270f482c612b55fa34f079e8 && \
hg topic upstream-merge && \
hg merge 5a8661f17ee3d69a3ded665d054e6921a6d2bb0c