Adapted to 4.4-SNAPSHOT, fixes ACL-entries