Merge pull request #2732 from waltdisgrace/t54
Separate ACL-related declarations from internal.h to new acl_internal.h