MAPREDUCE-5164. mapred job and queue commands omit HADOOP_CLIENT_OPTS. Contributed by Nemon Lou.
Merged revision 1522595 from trunk.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1522598 13f79535-47bb-0310-9956-ffa450edef68
YARN-1078. Merging change r1522645 from branch-2 to branch-2.1-beta

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