Add necessary CSR policy changes
This includes the necessary changes from !359 (merged) to make even the old pdf viewer work on new deployments.
This includes the necessary changes from !359 (merged) to make even the old pdf viewer work on new deployments.