Fix deleting of completeAcl
and sanity checks if the pk for an oid is not found
Merge branch 'patch-4' into cleanup

* patch-4:
  Fix deleting of completeAcl and sanity checks if the pk for an oid is not found