8d98e5c960
(cherry picked from commit bd69fb2d44403e930d1fc0868ed1dd2a49dd9659) Conflicts: hadoop-tools/hadoop-streaming/src/test/java/org/apache/hadoop/streaming/mapreduce/TestStreamXmlRecordReader.java