Merge branch 'bouter-develop-v1.2.1-patch-65270' of...

Merge branch 'bouter-develop-v1.2.1-patch-65270' of https://labs.etsi.org/rep/saref/saref4ener into bouter-develop-v1.2.1-patch-65270