Fix upstream merge conflict on 75eab0b5cfa6
Merging upstream commit 75eab0b5cfa6 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 5d052162650d956e50afe2ee5e80576d99ef43f3 && \
hg topic upstream-merge && \
hg merge 75eab0b5cfa629549f10ad4515f4ccdb9b51ce95