HDFS-5595: fix several test failures in mergeAclEntries related to mask calculation/preservation.