Merge branch 'master' of https://labs.etsi.org/rep/saref/saref-portal