Fix bug 842557 and bug 842564: Cull CSP and move GA to external JS file.