Merge "Add hotfix|update for openstack repos"