Merge branch 'cr/33128/0825' into 'meeting/SA112'

TS 33.128 CR0825 - Add PLMN Location in the UserLocation type

See merge request !367