hg 5.3 fixes

Anton Shestakovrequested to merge
topic/default/5.3-fixes into branch/default

Things needed for evolve tests to pass with current hg default.

Merge request reports