Allow customization of CSP headers

This is useful for inserting custom javascript in header/footer files.
Merge branch 'QA_4_0'