Merge "Add org.onap.so.cloud-owner"