Merge r1490396 from branch-2 to branch-2.1-beta for YARN-750. Allow for black-listing resources in YARN API and Impl in CS (acmurthy via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1490423 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4867. metaSave NPEs when there are invalid blocks in repl queue. Contributed by Plamen Jeliazkov and Ravi Prakash.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1490442 13f79535-47bb-0310-9956-ffa450edef68
Merge r1490440 from branch-2 to branch-2.1-beta for YARN-761. TestNMClientAsync fails sometimes (Zhijie Shen via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1490444 13f79535-47bb-0310-9956-ffa450edef68