Merge "CSP: Minor cleanup in ContentSecurityPolicy.php"