Merge aws-develop to smoke test

Can't show this merge request because the target branch aws-smoke-test-e2e is missing from project osdu/platform/deployment-and-operations/ibm-osdu-provisioning. Close this merge request or update the target branch.