Fix upstream merge conflict on c8b7349119ae
Merging upstream commit c8b7349119ae 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 dd8eb83aeb8acc3f4f662e033e2f6787783212e5 && \
hg topic upstream-merge && \
hg merge c8b7349119ae7753d3959277047a85886c649309