Fix upstream merge conflict on 3d143be1bdd7
Merging upstream commit 3d143be1bdd7 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 f337fed5022090b35830dac8c43d7154b8b66c2a && \
hg topic upstream-merge && \
hg merge 3d143be1bdd788057d0f0df3f07b3997ec69a49a