bug 1131: More policies updated by Policy Officer
Merge branch 'bug-1131' into testserver-stable