bug 1131: Update to CPS by Policy Officer
Merge branch 'bug-1131' into testserver-stable