resolving merge conflicts

.gitlab-ci.yml

pom.xml

provider/register-aws/build-aws/Dockerfile

provider/register-aws/build-aws/build-info.py

provider/register-aws/build-aws/buildspec.yaml

provider/register-aws/build-aws/os-register.build.json

provider/register-aws/maven/settings.xml

provider/register-aws/pom.xml

...group/osdu/register/provider/aws/RegisterApplication.java

...pengroup/osdu/register/provider/aws/action/ActionDoc.java

...roup/osdu/register/provider/aws/action/AwsActionRepo.java

...p/osdu/register/provider/aws/config/AwsServiceConfig.java

...pengroup/osdu/register/provider/aws/ddms/AwsDdmsRepo.java

...rg/opengroup/osdu/register/provider/aws/ddms/DdmsDoc.java

...roup/osdu/register/provider/aws/ddms/RegInterfaceDoc.java

...er/provider/aws/pushApi/AwsSubscriberTestListenerApi.java

...sdu/register/provider/aws/security/AwsSecurityConfig.java

...register/provider/aws/subscriber/AwsSubscriptionRepo.java

...roup/osdu/register/provider/aws/subscriber/KmsConfig.java

...roup/osdu/register/provider/aws/subscriber/KmsHelper.java