Merge "SDK Manager: support forward evolution of repository-N.xml"