YARN-602. Fixed NodeManager to not let users override some mandatory environmental variables. Contributed by Kenji Kikushima.
svn merge --ignore-ancestry -c 1518077 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1518079 13f79535-47bb-0310-9956-ffa450edef68
YARN-905. Add state filters to nodes CLI (Wei Yan via Sandy Ryza)
svn merge --ignore-ancestry -c 1517083 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1518082 13f79535-47bb-0310-9956-ffa450edef68
YARN-1081. Made a trivial change to YARN node CLI header to avoid potential confusion. Contributed by Akira AJISAKA.
svn merge --ignore-ancestry -c 1518080 ../../trunk/


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