Merge r1528632 from trunk to branch-2 for YARN-1141. Updating resource requests should be decoupled with updating blacklist (Zhijie Shen via bikas)