Merge "Add openstack repos on the Salt Master node in mcp11 and ocata models"