Merge -c 1492962 from trunk to branch-2 to fix MAPREDUCE-5319. Set user.name in job.xml. Contributed by Xuan Gong.