Merge branch 'multi_service_location' into 'REL-19'
[AMD_PRO-MED] WT2: Multi-service location (26510-CR0016 -> 26510-CR0032, 26512-CR0086 -> 26512-CR0097) See merge request !5
[AMD_PRO-MED] WT2: Multi-service location (26510-CR0016 -> 26510-CR0032, 26512-CR0086 -> 26512-CR0097) See merge request !5