Fix for supporting datacenter id on SCE
Merge branch 'sce' into develop
Location for SCE displayed as full name + id