Acl cleanup

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Unit test passes: yes
Behat scenarios passes: ?
Checkstyle issues: no
ChangeLog updated: yes
Documentation PR: ~
Fixes the following jira: ~