Merge "Fix Defaults"

diff --combined volumes/so/config/bpmn-infra/onapheat/override.yaml
index 06a076e,9f34ba6..be315eb
--- 1/volumes/so/config/bpmn-infra/onapheat/override.yaml
--- 2/volumes/so/config/bpmn-infra/onapheat/override.yaml
+++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml
@@@ -110,9 -110,9 +110,9 @@@ mso
        aai:
          version: '14'
          cloud-region:
 -          version: '9'
 +          version: '14'
          generic-vnf:
 -          version: '9'
 +          version: '14'
          v14:
            customer:
              uri: /aai/v14/business/customers/customer
@@@ -129,7 -129,7 +129,7 @@@
            route-table-reference:
              uri: /aai/v14/network/route-table-references/route-table-reference
            tenant:
-             uri: /aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
+             uri: /aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
            vce:
              uri: /aai/v14/network/vces/vce
            vpn-binding:
@@@ -150,7 -150,7 +150,7 @@@
            route-table-reference:
              uri: /aai/v11/network/route-table-references/route-table-reference
            tenant:
-             uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
+             uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
            vce:
              uri: /aai/v11/network/vces/vce
            vpn-binding:
@@@ -171,14 -171,14 +171,14 @@@
            route-table-reference:
              uri: /aai/v8/network/route-table-references/route-table-reference
            tenant:
-             uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant
+             uri: /aai/v8/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant
            vce:
              uri: /aai/v8/network/vces/vce
            vpn-binding:
              uri: /aai/v8/network/vpn-bindings/vpn-binding
          v9:
            cloud-region:
-             uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic
+             uri: /aai/v9/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner
            generic-vnf:
              uri: /aai/v9/network/generic-vnfs/generic-vnf
        retry: