MAPREDUCE-5834. Increased test-timeouts in TestGridMixClasses to avoid occassional failures. Contributed by Mit Desai. svn merge --ignore-ancestry -c 1601764 ../../trunk/