MAPREDUCE-2793. Reneabling commented out test from previous commit. svn merge --ignore-ancestry -c 1293521 ../../trunk