Merge -c 1236594 from trunk to branch-0.23 to fix MAPREDUCE-3693. Added mapreduce.admin.user.env to mapred-default.xml.