Merge branch 'develop' into parent-child-characteristics

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

...sl/services/api/scm633/ExportJobApiController633Test.java

...rg/etsi/osl/services/api/scm633/HubApiControllerTest.java

...i/osl/services/api/scm633/ImportJobApiControllerTest.java

...si/osl/services/api/scm633/ListenerApiControllerTest.java

...ervices/api/scm633/ServiceCandidateApiControllerTest.java

.../services/api/scm633/ServiceCatalogApiControllerTest.java

...services/api/scm633/ServiceCategoryApiControllerTest.java

...ces/api/scm633/ServiceSpecificationApiControllerTest.java

src/test/resources/testEventSubscriptionInput.json

src/test/resources/testExportJob.json

src/test/resources/testServiceCandidate.txt

...est/resources/testServiceCandidateChangeNotification.json