HDFS-4685-WIP: restore special case for removing ACL when acl spec is empty, and clean up unused imports.