Merge branch 'rh/remote-hg-bzr-updates'