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

# Conflicts:
#	indexer-core/pom.xml
#	indexer-service-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java
#	pom.xml
#	provider/indexer-aws/src/main/java/org/opengroup/osdu/indexer/aws/di/TenantInfoFactory.java
#	provider/indexer-gcp/src/main/java/org/opengroup/osdu/indexer/di/TenantInfoFactory.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/DeleteSchemaSteps.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/GetSchemaSteps.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/MappingSteps.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/RecordSteps.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/models/TestIndex.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/ElasticUtils.java
#	testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/HTTPClient.java
#	testing/indexer-test-core/src/main/resources/features/indexrecord/IndexRecord.feature