resolve merge conflicts

.fossa.yml

NOTICE

devops/azure/chart/values.yaml

notification-core/pom.xml

pom.xml

provider/notification-aws/pom.xml

provider/notification-azure/pom.xml

provider/notification-gcp/README.md

provider/notification-gcp/cloudbuild/Dockerfile.cloudbuild

provider/notification-gcp/pom.xml

...notification/provider/gcp/di/PartitionProviderConfig.java

...rovider/gcp/mappers/oqm/MqOqmConfigurationProperties.java

...vider/gcp/mappers/oqm/MqTenantOqmDestinationResolver.java

.../provider/gcp/mappers/oqm/OqmConfigurationProperties.java

...vider/gcp/mappers/oqm/PsTenantOqmDestinationResolver.java

...otification/provider/gcp/pubsub/OqmSubscriberManager.java

...cation/provider/gcp/pubsub/di/OqmNotificationHandler.java

...ification/provider/gcp/pubsub/di/OqmSignatureService.java

...n/provider/gcp/pubsub/di/OqmSubscriptionCacheFactory.java

...cation/provider/gcp/pubsub/di/OqmSubscriptionHandler.java