Merge branch 'develop-v4.1.1' of ssh://labs.etsi.org:29419/saref/saref-core into develop-v4.1.1