Use is_default_acl variable in canonicalise_acl(). (cherry picked from commit 82e7132...