Fix upstream merge conflict on 0f56157b9639
Merging upstream commit 0f56157b9639 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 8def7de77be12d3391f0e1ffbfb20c7bc5f59218 && \
hg topic upstream-merge && \
hg merge 0f56157b9639577fa5b8c034ef198fae7bca9c6c