Merge -r 1378872:1378873 from trunk to branch-2. Fixes: MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.