Merge branch 'develop' into parent-child-characteristics

.gitlab-ci.yml

Dockerfile

ci_settings.xml

pom.xml

src/main/java/org/etsi/osl/tmf/JsonUtils.java

.../etsi/osl/tmf/ri639/reposervices/ResourceRepoService.java

...etsi/osl/services/api/AlarmManagementIntegrationTest.java

...va/org/etsi/osl/services/api/CustomerIntegrationTest.java

src/test/java/org/etsi/osl/services/api/JsonUtils.java

...va/org/etsi/osl/services/api/LCMRulesIntegrationTest.java

...etsi/osl/services/api/PartyManagementIntegrationTest.java

.../etsi/osl/services/api/ProductCatalogIntegrationTest.java

...etsi/osl/services/api/ResourceCatalogIntegrationTest.java

...si/osl/services/api/ResourceInventoryIntegrationTest.java

...g/etsi/osl/services/api/ResourceOrderIntegrationTest.java

...rg/etsi/osl/services/api/ResourcePoolIntegrationTest.java

.../etsi/osl/services/api/ServiceCatalogIntegrationTest.java

...tsi/osl/services/api/ServiceInventoryIntegrationTest.java

...rg/etsi/osl/services/api/ServiceOrderIntegrationTest.java

...sl/services/api/ServiceTestManagementIntegrationTest.java