Merge -r 1307412:1307413 from trunk to branch. FIXES: MAPREDUCE-3916

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

hadoop-mapreduce-project/CHANGES.txt

@@ -95,6 +95,8 @@ Release 2.0.0 - UNRELEASED
     MAPREDUCE-4082. hadoop-mapreduce-client-app's mrapp-generated-classpath 
     file should not be in the module JAR (tucu)
 
+    MAPREDUCE-3916. various issues with running yarn proxyserver (devaraj via tucu)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml

@@ -477,8 +477,7 @@
   
   <property>
     <description>The address for the web proxy as HOST:PORT, if this is not
-     given or if it matches yarn.resourcemanager.address then the proxy will
-     run as part of the RM</description>
+     given then the proxy will run as part of the RM</description>
      <name>yarn.web-proxy.address</name>
      <value/>
   </property>