Merge branch 'periodic' of https://github.com/dlacko/freenas
Add mention of AFP ACL<->ZFS ACL support
Merge branch 'master' of gitserver.ixsystems.com:/git/repos/freenas-build/freenas