HDFS-5595: multiple test fixes in mergeAclEntries.