merge update_policies branch

git-svn-id: https://svn.qindel.com/repos/main/projects/qindel/QVD/src/trunk@20779 4046b530-fbad-4e16-af16-ee11f0b55167