Siddharth Seth 5254328035 merge MAPREDUCE-3640 from trunk 13 lat temu
..
main 5254328035 merge MAPREDUCE-3640 from trunk 13 lat temu
test 5254328035 merge MAPREDUCE-3640 from trunk 13 lat temu