Merge branch 'stf606-final' of https://forge.etsi.org/rep/mec/gs013-location-api into stf606-final