HDFS-5595: minor cleanup in AclMergeFunctions.