Merge branch 'develop' of https://labs.etsi.org/rep/osl/code/org.etsi.osl.osom into develop