Merge "Fix XmlManifest.Save with remotes that have 'alias' set"