HADOOP-9455. HADOOP_CLIENT_OPTS appended twice causes JVM failures. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478067 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478072 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-260-trunk-gd