svn merge -c 1332226. FIXES: MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing scope test (Radim Kolar via bobby)