CSP tests
@bug W-2110517@
@rev tbliss@
Merging origin/gtorres/master-pending-csptest into master