Merge branch 'master' of community.opengroup.org:osdu/platform/system/schema-service into aws-integration-only