Merge "Use the canonical URL for repositories (git.openstack.org)"