MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza. svn merge --ignore-ancestry -c 1461541 ../../trunk/