Fix upstream merge conflict on f6150b35a051
Merging upstream commit f6150b35a051 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 25374502c5cf03e19c606e46ce082d468ee4338c && \
hg topic upstream-merge && \
hg merge f6150b35a0514bc6a82dede2a1cb5840fff2aaa9