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