Siddharth Seth e2beaf7976 merge MAPREDUCE-3856 from trunk 13 lat temu
..
main e2beaf7976 merge MAPREDUCE-3856 from trunk 13 lat temu
test e2beaf7976 merge MAPREDUCE-3856 from trunk 13 lat temu