MAPREDUCE-5205. Fixed MR App to load tokens correctly. Contributed by Vinod Kumar Vavilapalli. svn merge --ignore-ancestry -c 1479016 ../../trunk/