Merge branch 'MAPREDUCE-5062' into YARN-378
Merge remote-tracking branch 'apache/trunk' into YARN-378
Combine both YARN-378 and MAPREDUCE-5062, and fix whitespace characters.