Merge changes from topic "dataMigration" into udc-dev

* changes:
  Fix lock task logging for permission based admins
  Remove policies for admins on role/package removal
  Migrate existing policies to the policy engine