rebasing branch yarn-1051 with trunk to keep pace
Merge branch 'YARN-1051' of https://git-wip-us.apache.org/repos/asf/hadoop into YARN-1051