Merge remote-tracking branch 'origin/master' into integration-master

# Conflicts:
#	indexer-core/src/main/java/org/opengroup/osdu/indexer/api/CleanupIndiciesApi.java
#	indexer-core/src/test/java/org/opengroup/osdu/indexer/api/CleanupIndiciesApiTest.java
#	provider/indexer-gcp/src/main/appengine/app.yaml
#	provider/indexer-gcp/src/main/resources/application.properties
2 jobs for !46 with GCP-fix-swagger in 31 minutes and 8 seconds (queued for 2 seconds)
detached
Status Name Job ID Coverage
  Review
passed trigger-trusted-tests #92755
osdu-small

00:31:08

failed trigger-trusted-tests #91645
osdu-small

00:02:18