Merge branch 'cr/103120/0030' of forge.etsi.org:li/schemas-definitions into cr/103120/0030