Merge "XSS Vulnerability fix in RoleManageController"