HDFS-5595: WIP 4
HDFS-5594: fix typo in Acl JavaDoc.
Merge branch 'HDFS-5594' into HDFS-5595