branching: merge the stable branch with the mercurial-5.1 branch This revert all the test changes to match the expected output for mercurial 5.1.

{"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}