CDB-3103 Removed some stored ACL fields, added presenter to decorate instead upon returning ACLs
Merge branch 'CDB-3103' into CDB-2891