Merge "XSS Vulnerability fix in ExternalAccessRolesControllerDashboardController"