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