svn merge -c 1306901 from trunk to branch-2 FIXES: MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via bobby)