Merge branch 'dev' of codecommit://os-crs-catalog into aws-integration

6 jobs for !40 with aws-integration in 49 minutes and 7 seconds
latest merge request