Fixes #20963 - CVE-2017-7535 prevent XSS on org/loc host assign
(cherry picked from commit b8db2f931208992d6bcff44a2d20101637f6c232)
Fixes #20963 - CVE-2017-7535 prevent XSS on org/loc host assign
(cherry picked from commit b8db2f931208992d6bcff44a2d20101637f6c232)