Make it easier to override the policy
@bug W-2129820@
@rev goliver@
Merging origin/amcculloch/master-pending/CSP into master