[PATCH] ACL cleanup in 3.2

This is my attempted port of Alexs' ACL cleanups. They require the ACL
extensions changes (what remained in trunk anyway), so teh differences
there between trunk and 3.2 have been included in this patch.

So far they are testing out okay on builds, but there is a bit longer to
go on that.

If there are no objections I plan to release 3.2.0.18 and apply this
change to 3.2 branch afterward.

Amos