svn merge -c 1433445 FIXES: MAPREDUCE-4936. JobImpl uber checks for cpu are wrong. Contributed by Arun C Murthy