Merge branch 'develop' into 'range-interval-type-validation'

# Conflicts:
#   src/test/java/org/etsi/osl/services/api/scm633/ServiceSpecificationApiControllerTest.java