Fix upstream merge conflict on aaaa3b587acf
Merging upstream commit aaaa3b587acf 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 be5f21b2e4c41eac0c38c3da50aaf976c5a17961 && \
hg topic upstream-merge && \
hg merge aaaa3b587acf9e9560197dac5b1e09f90f36e099