Siddharth Seth 5254328035 merge MAPREDUCE-3640 from trunk 13 gadi atpakaļ
..
main 5254328035 merge MAPREDUCE-3640 from trunk 13 gadi atpakaļ
test 5254328035 merge MAPREDUCE-3640 from trunk 13 gadi atpakaļ