bug 1131: Updated Policies based on new versions send by Policy Officer

Additionally trailing whitespaces, indentation and line breaks have been
partially edited to ease reading of the HTML code.

The CCA has been skipped to avoid race conditions with other currently
running processes.
Merge branch 'bug-1131' into testserver-stable