merge conflicts

provider/indexer-aws/pom.xml

...g/opengroup/osdu/indexer/aws/api/RecordIndexerAwsApi.java

.../org/opengroup/osdu/indexer/aws/model/CallableResult.java

...java/org/opengroup/osdu/indexer/aws/model/SQSMessage.java

...org/opengroup/osdu/indexer/aws/publish/PublisherImpl.java

...sdu/indexer/aws/service/AwsElasticSettingServiceImpl.java

...oup/osdu/indexer/aws/service/ElasticClientHandlerAws.java

...g/opengroup/osdu/indexer/aws/util/AsyncConfiguration.java

...ngroup/osdu/indexer/aws/util/ElasticThrottlePoolImpl.java

.../org/opengroup/osdu/indexer/aws/util/RequestInfoImpl.java

...g/opengroup/osdu/indexer/aws/util/sqs/IndexProcessor.java

...src/test/java/org/opengroup/osdu/indexer/aws/AppTest.java

...p/osdu/indexer/aws/auth/AuthorizationServiceImplTest.java

...opengroup/osdu/indexer/aws/publish/PublisherImplTest.java

.../src/main/java/org/opengroup/osdu/common/RecordSteps.java

...st-core/src/main/java/org/opengroup/osdu/util/Config.java