New addendum to YARN-5080. Cannot obtain logs using YARN CLI -am for either KILLED or RUNNING AM.

(cherry picked from commit 7705812c7e3a9f3f774130e25443fda249c08c9c)
(cherry picked from commit 54812841e2f26275c2d993c73af45a9bbae3e3bf)

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/LogsCLI.java

@@ -380,9 +380,8 @@ public class LogsCLI extends Configured implements Tool {
       Configuration conf, String appId) throws ClientHandlerException,
       UniformInterfaceException, JSONException {
     Client webServiceClient = Client.create();
-    String webAppAddress = WebAppUtils.getHttpSchemePrefix(conf) +
-        WebAppUtils.getWebAppBindURL(conf, YarnConfiguration.RM_BIND_HOST,
-        WebAppUtils.getRMWebAppURLWithoutScheme(conf));
+    String webAppAddress = WebAppUtils.getRMWebAppURLWithScheme(conf);
+
     WebResource webResource = webServiceClient.resource(webAppAddress);
 
     ClientResponse response =