Conflict resolve for merge ibm-devlop into opengroup master

provider/register-ibm/pom.xml

.../provider/ibm/ddms/datastore/DatastoreDdmsRepository.java

...group/osdu/register/middleware/GlobalExceptionMapper.java

...p/osdu/register/middleware/GlobalExceptionMapperTest.java

...g/opengroup/osdu/register/action/TestCreateActionApi.java

...g/opengroup/osdu/register/action/TestDeleteActionApi.java

.../opengroup/osdu/register/action/TestGetActionByIdApi.java

...opengroup/osdu/register/action/TestRetrieveActionApi.java

...engroup/osdu/register/ddms/TestCreateRegistrationApi.java

...engroup/osdu/register/ddms/TestDeleteRegistrationApi.java

...engroup/osdu/register/ddms/TestGetConsumptionByIdApi.java

...ngroup/osdu/register/ddms/TestGetRegistrationByIdApi.java

...org/opengroup/osdu/register/ddms/TestQueryDdmsByType.java

...oup/osdu/register/subscriber/TestCreateSubscriberApi.java

...oup/osdu/register/subscriber/TestDeleteSubscriberApi.java

...up/osdu/register/subscriber/TestGetSubscriberByIdApi.java

...opengroup/osdu/register/subscriber/TestListTopicsApi.java

...engroup/osdu/register/subscriber/TestQuerySubscriber.java

...t/java/org/opengroup/osdu/register/util/IBMTestUtils.java