MAPREDUCE-5809: correct prior merge
MAPREDUCE-5809: expanding on HDFS-6326 changes, still has bugs, TestDistCpWithAcls fails