You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/04/24 17:29:26 UTC

[ambari] branch branch-2.6 updated: [AMBARI-23663] Ensure URLs to Ambari server resources are valid

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
     new 0b9b7be  [AMBARI-23663] Ensure URLs to Ambari server resources are valid
0b9b7be is described below

commit 0b9b7be0a456c8ca82543e6defe845665733b767
Author: Robert Levas <rl...@hortonworks.com>
AuthorDate: Tue Apr 24 12:35:32 2018 -0400

    [AMBARI-23663] Ensure URLs to Ambari server resources are valid
---
 .../src/test/python/ambari_agent/TestFileCache.py  |  4 +-
 .../ambari_commons/credential_store_helper.py      |  2 +-
 .../server/orm/InMemoryDefaultTestModule.java      |  2 +-
 .../funtest/server/tests/ServerTestBase.java       |  2 +-
 .../2.0.7/services/HIVE/package/scripts/hive.py    |  2 +-
 .../controller/AmbariManagementControllerImpl.java |  3 +-
 .../ambari/server/controller/AmbariServer.java     |  8 ++-
 .../DRUID/0.10.1/package/scripts/druid.py          |  2 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py        |  2 +-
 .../0.12.0.2.0/package/scripts/hive_interactive.py |  2 +-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py       |  2 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py      |  2 +-
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py    |  2 +-
 .../resources/custom_actions/scripts/check_host.py | 32 ++++++++---
 .../0.8/services/HIVE/package/scripts/hive.py      |  2 +-
 .../0.8/services/OOZIE/package/scripts/oozie.py    |  2 +-
 .../4.0/services/HIVE/package/scripts/hive.py      |  2 +-
 .../4.0/services/OOZIE/package/scripts/oozie.py    |  2 +-
 .../4.2.5/services/OOZIE/package/scripts/oozie.py  |  2 +-
 .../4.2/services/HIVE/package/scripts/hive.py      |  2 +-
 .../4.2/services/OOZIE/package/scripts/oozie.py    |  2 +-
 .../RANGER/package/scripts/setup_ranger_xml.py     |  2 +-
 .../src/test/python/TestResourceFilesKeeper.py     |  2 +-
 .../common-services/configs/hawq_default.json      |  2 +-
 .../common-services/configs/hive_default.json      |  2 +-
 .../configs/hive_unsupported_jdbc_type.json        |  2 +-
 .../common-services/configs/pxf_default.json       |  2 +-
 .../configs/ranger_admin_default.json              |  2 +-
 .../ranger_admin_unsupported_db_flavor.json        |  2 +-
 .../configs/ranger_kms_default.json                |  6 +--
 .../configs/ranger_kms_unsupported_db_flavor.json  |  6 +--
 .../common-services/configs/sqoop_default.json     |  2 +-
 .../configs/sqoop_unsupported_jdbc_driver.json     |  2 +-
 .../test/python/custom_actions/TestCheckHost.py    |  8 +++
 .../configs/install_packages_config.json           |  6 +--
 .../configs/install_packages_repository_file.json  |  6 +--
 .../configs/remove_previous_stacks.json            |  6 +--
 .../stacks/2.0.6/HIVE/test_hive_metastore.py       |  6 +--
 .../python/stacks/2.0.6/HIVE/test_hive_server.py   |  4 +-
 .../python/stacks/2.0.6/OOZIE/test_oozie_server.py |  6 +--
 .../test/python/stacks/2.0.6/SQOOP/test_sqoop.py   |  4 +-
 .../stacks/2.0.6/configs/altfs_plus_hdfs.json      |  2 +-
 .../stacks/2.0.6/configs/client-upgrade.json       |  6 +--
 .../stacks/2.0.6/configs/default.hbasedecom.json   |  2 +-
 .../test/python/stacks/2.0.6/configs/default.json  |  2 +-
 .../2.0.6/configs/default.non_gmetad_host.json     |  2 +-
 .../stacks/2.0.6/configs/default_ams_embedded.json |  2 +-
 .../stacks/2.0.6/configs/default_client.json       |  2 +-
 .../stacks/2.0.6/configs/default_hive_nn_ha.json   |  2 +-
 .../stacks/2.0.6/configs/default_hive_nn_ha_2.json |  2 +-
 .../2.0.6/configs/default_hive_non_hdfs.json       |  2 +-
 .../stacks/2.0.6/configs/default_no_install.json   |  2 +-
 .../stacks/2.0.6/configs/default_oozie_mysql.json  |  2 +-
 .../configs/default_update_exclude_file_only.json  |  2 +-
 .../stacks/2.0.6/configs/default_with_bucket.json  |  2 +-
 .../default_yarn_include_file_dont_manage.json     |  2 +-
 .../configs/default_yarn_include_file_manage.json  |  2 +-
 .../test/python/stacks/2.0.6/configs/flume_22.json |  2 +-
 .../python/stacks/2.0.6/configs/flume_only.json    |  2 +-
 .../python/stacks/2.0.6/configs/flume_target.json  |  2 +-
 .../2.0.6/configs/ha_bootstrap_active_node.json    |  6 +--
 .../2.0.6/configs/ha_bootstrap_standby_node.json   |  6 +--
 .../ha_bootstrap_standby_node_initial_start.json   |  6 +--
 ...tandby_node_initial_start_dfs_nameservices.json |  6 +--
 .../python/stacks/2.0.6/configs/ha_default.json    |  6 +--
 .../python/stacks/2.0.6/configs/ha_secured.json    |  6 +--
 .../python/stacks/2.0.6/configs/hbase-2.2.json     |  6 +--
 .../stacks/2.0.6/configs/hbase-check-2.2.json      |  6 +--
 .../stacks/2.0.6/configs/hbase-preupgrade.json     |  6 +--
 .../stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json |  6 +--
 .../python/stacks/2.0.6/configs/hbase-rs-2.2.json  |  6 +--
 .../python/stacks/2.0.6/configs/hbase_no_phx.json  |  2 +-
 .../stacks/2.0.6/configs/hbase_with_phx.json       |  2 +-
 .../test/python/stacks/2.0.6/configs/nn_eu.json    |  6 +--
 .../python/stacks/2.0.6/configs/nn_eu_standby.json |  6 +--
 .../python/stacks/2.0.6/configs/nn_ru_lzo.json     |  6 +--
 .../stacks/2.0.6/configs/oozie_existing_sqla.json  |  2 +-
 .../2.0.6/configs/ranger-namenode-start.json       |  6 +--
 .../2.0.6/configs/rebalancehdfs_default.json       |  8 +--
 .../2.0.6/configs/rebalancehdfs_secured.json       |  8 +--
 .../test/python/stacks/2.0.6/configs/secured.json  |  6 +--
 .../stacks/2.0.6/configs/secured_client.json       |  6 +--
 .../stacks/2.0.6/configs/secured_no_jce_name.json  |  6 +--
 .../secured_yarn_include_file_dont_manage.json     |  6 +--
 .../configs/secured_yarn_include_file_manage.json  |  6 +--
 .../stacks/2.0.6/configs/zk-service_check_2.2.json |  6 +--
 .../2.0.6/hooks/before-ANY/test_before_any.py      |  2 +-
 .../python/stacks/2.1/FALCON/test_falcon_server.py |  2 +-
 .../python/stacks/2.1/HIVE/test_hive_metastore.py  | 10 ++--
 .../python/stacks/2.1/configs/client-upgrade.json  |  6 +--
 .../stacks/2.1/configs/default-storm-start.json    |  6 +--
 .../test/python/stacks/2.1/configs/default.json    |  2 +-
 .../stacks/2.1/configs/hive-metastore-upgrade.json |  6 +--
 .../stacks/2.1/configs/secured-storm-start.json    |  6 +--
 .../test/python/stacks/2.1/configs/secured.json    |  6 +--
 .../python/stacks/2.2/RANGER/test_ranger_admin.py  |  4 +-
 .../test/python/stacks/2.2/configs/default.json    |  2 +-
 .../2.2/configs/default_custom_path_config.json    |  2 +-
 .../python/stacks/2.2/configs/falcon-upgrade.json  |  6 +--
 .../python/stacks/2.2/configs/hive-upgrade.json    |  6 +--
 .../configs/journalnode-upgrade-hdfs-secure.json   |  6 +--
 .../stacks/2.2/configs/journalnode-upgrade.json    |  6 +--
 .../python/stacks/2.2/configs/knox_upgrade.json    |  6 +--
 .../python/stacks/2.2/configs/oozie-downgrade.json |  6 +--
 .../python/stacks/2.2/configs/oozie-upgrade.json   |  6 +--
 .../2.2/configs/pig-service-check-secure.json      |  6 +--
 .../stacks/2.2/configs/ranger-admin-default.json   |  2 +-
 .../stacks/2.2/configs/ranger-admin-secured.json   |  2 +-
 .../stacks/2.2/configs/ranger-admin-upgrade.json   |  6 +--
 .../2.2/configs/ranger-usersync-upgrade.json       |  6 +--
 .../test/python/stacks/2.2/configs/secured.json    |  2 +-
 .../2.2/configs/spark-job-history-server.json      |  2 +-
 .../test/python/stacks/2.3/configs/ats_1_5.json    |  2 +-
 .../stacks/2.3/configs/default.hbasedecom.json     |  2 +-
 .../test/python/stacks/2.3/configs/default.json    |  2 +-
 .../python/stacks/2.3/configs/hbase_default.json   |  6 +--
 .../python/stacks/2.3/configs/hbase_secure.json    |  6 +--
 .../src/test/python/stacks/2.3/configs/secure.json |  2 +-
 .../python/stacks/2.3/configs/spark_default.json   |  2 +-
 .../python/stacks/2.3/configs/storm_default.json   |  6 +--
 .../stacks/2.3/configs/storm_default_secure.json   |  6 +--
 .../test/python/stacks/2.4/configs/default.json    |  2 +-
 .../python/stacks/2.5/HIVE/test_hive_server_int.py |  2 +-
 .../python/stacks/2.5/RANGER/test_ranger_admin.py  |  4 +-
 .../stacks/2.5/RANGER_KMS/test_kms_server.py       |  8 +--
 .../test/python/stacks/2.5/configs/default.json    |  2 +-
 .../python/stacks/2.5/configs/hsi_default.json     |  2 +-
 .../2.5/configs/hsi_default_for_restart.json       |  2 +-
 .../src/test/python/stacks/2.5/configs/hsi_ha.json |  2 +-
 .../stacks/2.5/configs/ranger-admin-default.json   |  6 +--
 .../stacks/2.5/configs/ranger-admin-secured.json   |  6 +--
 .../stacks/2.5/configs/ranger-kms-default.json     |  6 +--
 .../stacks/2.5/configs/ranger-kms-secured.json     |  6 +--
 .../src/test/python/stacks/2.6/DRUID/test_druid.py |  2 +-
 .../python/stacks/2.6/RANGER/test_ranger_admin.py  |  6 +--
 .../test/python/stacks/2.6/configs/default.json    |  2 +-
 .../2.6/configs/default_kafka_plaintext.json       |  2 +-
 .../2.6/configs/default_kafka_plaintextsasl.json   |  2 +-
 .../2.6/configs/default_kafka_sasl_plaintext.json  |  2 +-
 .../stacks/2.6/configs/default_kafka_sasl_ssl.json |  2 +-
 .../stacks/2.6/configs/ranger-admin-default.json   |  6 +--
 .../stacks/2.6/configs/ranger-admin-secured.json   |  6 +--
 .../stacks/2.6/configs/secure_kafka_sasl_ssl.json  |  2 +-
 .../HIVE/0.11.0.2.0.5.0/package/scripts/hive.py    |  2 +-
 .../dummy_stack/HIVE/package/scripts/hive.py       |  2 +-
 .../custom_actions/check_host_ip_addresses.json    |  6 +--
 .../custom_actions/check_last_agent_env.json       |  4 +-
 .../resources/custom_actions/invalid_check.json    |  6 +--
 .../ru_execute_tasks_namenode_prepare.json         |  6 +--
 .../2.0.7/services/HIVE/package/scripts/hive.py    |  2 +-
 .../app/assets/data/stack_versions/upgrade.json    | 62 +++++++++++-----------
 .../assets/data/wizard/deploy/5_hosts/poll_3.json  |  8 +--
 .../assets/data/wizard/deploy/5_hosts/poll_4.json  |  8 +--
 .../assets/data/wizard/deploy/5_hosts/poll_5.json  |  8 +--
 .../data/wizard/deploy/master_failure/poll_3.json  |  8 +--
 .../data/wizard/deploy/master_failure/poll_4.json  |  8 +--
 .../data/wizard/deploy/slave_failure/poll_3.json   |  8 +--
 .../data/wizard/deploy/slave_failure/poll_4.json   |  8 +--
 .../data/wizard/deploy/slave_warning/poll_3.json   |  8 +--
 .../data/wizard/deploy/slave_warning/poll_4.json   |  8 +--
 .../data/wizard/deploy/slave_warning/poll_5.json   |  8 +--
 .../data/wizard/kerberos/kerberize_cluster.json    |  6 +--
 .../ODPi/2.0/services/HIVE/package/scripts/hive.py |  2 +-
 .../HIVE/package/scripts/hive_interactive.py       |  2 +-
 164 files changed, 393 insertions(+), 372 deletions(-)

diff --git a/ambari-agent/src/test/python/ambari_agent/TestFileCache.py b/ambari-agent/src/test/python/ambari_agent/TestFileCache.py
index 00f6b69..00749c1 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestFileCache.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestFileCache.py
@@ -280,10 +280,10 @@ class TestFileCache(TestCase):
 
   def test_build_download_url(self):
     fileCache = FileCache(self.config)
-    url = fileCache.build_download_url('http://localhost:8080/resources/',
+    url = fileCache.build_download_url('http://localhost:8080/resources',
                                        'stacks/HDP/2.1.1/hooks', 'archive.zip')
     self.assertEqual(url,
-        'http://localhost:8080/resources//stacks/HDP/2.1.1/hooks/archive.zip')
+        'http://localhost:8080/resources/stacks/HDP/2.1.1/hooks/archive.zip')
 
 
   @patch("urllib2.OpenerDirector.open")
diff --git a/ambari-common/src/main/python/ambari_commons/credential_store_helper.py b/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
index 914c1c7..81b59a4 100644
--- a/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
+++ b/ambari-common/src/main/python/ambari_commons/credential_store_helper.py
@@ -31,7 +31,7 @@ def get_password_from_credential_store(alias, provider_path, cs_lib_path, java_h
     # Try to download CredentialUtil.jar from ambari-server resources
     credential_util_dir = cs_lib_path.split('*')[0] # Remove the trailing '*'
     credential_util_path = os.path.join(credential_util_dir, credential_util_jar)
-    credential_util_url =  jdk_location + credential_util_jar
+    credential_util_url =  jdk_location + '/' + credential_util_jar
     File(credential_util_path,
          content = DownloadSource(credential_util_url),
          mode = 0755,
diff --git a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/orm/InMemoryDefaultTestModule.java b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/orm/InMemoryDefaultTestModule.java
index 2932f93..52d425c 100644
--- a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/orm/InMemoryDefaultTestModule.java
+++ b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/orm/InMemoryDefaultTestModule.java
@@ -61,7 +61,7 @@ public class InMemoryDefaultTestModule extends AbstractModule {
   protected void configure() {
     String stacks = "src/test/resources/stacks";
     String version = "src/test/resources/version";
-    String sharedResourcesDir = "src/test/resources/";
+    String sharedResourcesDir = "src/test/resources";
     if (System.getProperty("os.name").contains("Windows")) {
       stacks = ClassLoader.getSystemClassLoader().getResource("stacks").getPath();
       version = new File(new File(ClassLoader.getSystemClassLoader().getResource("").getPath()).getParent(), "version").getPath();
diff --git a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/ServerTestBase.java b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/ServerTestBase.java
index a1d672e..ce6a173 100644
--- a/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/ServerTestBase.java
+++ b/ambari-funtest/src/test/java/org/apache/ambari/funtest/server/tests/ServerTestBase.java
@@ -103,7 +103,7 @@ public class ServerTestBase {
             properties.setProperty(Configuration.METADATA_DIR_PATH.getKey(), "src/test/resources/stacks");
             properties.setProperty(Configuration.SERVER_VERSION_FILE.getKey(), "src/test/resources/version");
             properties.setProperty(Configuration.OS_VERSION.getKey(), "centos6");
-            properties.setProperty(Configuration.SHARED_RESOURCES_DIR.getKey(), "src/test/resources/");
+            properties.setProperty(Configuration.SHARED_RESOURCES_DIR.getKey(), "src/test/resources");
 
             properties.setProperty(Configuration.AGENT_USE_SSL.getKey(), "false");
             properties.setProperty(Configuration.CLIENT_API_PORT.getKey(), Integer.toString(serverPort));
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py b/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py
index f813755..3957ba9 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py
@@ -49,7 +49,7 @@ def hive(name=None):
   )
 
   cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 "
-               "{jdk_location}{check_db_connection_jar_name} -o {check_db_connection_jar_name}'")
+               "{jdk_location}/{check_db_connection_jar_name} -o {check_db_connection_jar_name}'")
 
   Execute(cmd,
           not_if=format("[ -f {check_db_connection_jar_name}]"))
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 2611e5a..2508da4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -334,8 +334,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
   final private Integer masterPort;
   final private String masterProtocol;
 
-  final private static String JDK_RESOURCE_LOCATION =
-      "/resources/";
+  final private static String JDK_RESOURCE_LOCATION = "/resources";
 
   final private static int REPO_URL_CONNECT_TIMEOUT = 3000;
   final private static int REPO_URL_READ_TIMEOUT = 2000;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 154d4e7..9f662ac 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -484,11 +484,9 @@ public class AmbariServer {
       agentroot.addServlet(cert, "/*");
       cert.setInitOrder(4);
 
-      ServletHolder resources = new ServletHolder(ServletContainer.class);
-      resources.setInitParameter("com.sun.jersey.config.property.resourceConfigClass",
-          "com.sun.jersey.api.core.PackagesResourceConfig");
-      resources.setInitParameter("com.sun.jersey.config.property.packages",
-          "org.apache.ambari.server.resources.api.rest;");
+      File resourcesDirectory = new File(configs.getResourceDirPath());
+      ServletHolder resources = new ServletHolder(DefaultServlet.class);
+      resources.setInitParameter("resourceBase", resourcesDirectory.getParent());
       root.addServlet(resources, "/resources/*");
       resources.setInitOrder(5);
 
diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py
index 42e6208..b20083a 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid.py
@@ -278,7 +278,7 @@ def download_database_connector_if_needed():
     return
 
   File(params.check_db_connection_jar,
-       content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}"))
+       content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}"))
        )
 
   target_jar_with_directory = params.connector_download_dir + os.path.sep + params.jdbc_driver_jar
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index f0fdc02..b8d8361 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -312,7 +312,7 @@ def hive(name=None):
       jdbc_connector(params.hive2_jdbc_target, params.hive2_previous_jdbc_jar)
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-       content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+       content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
        mode = 0644,
   )
 
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
index 73e6da4..9323a53 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
@@ -315,7 +315,7 @@ def hive_interactive(name=None):
     jdbc_connector(params.target_hive_interactive, params.hive_intaractive_previous_jdbc_jar)
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-       content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+       content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
        mode = 0644)
   File(params.start_hiveserver2_interactive_path,
        mode=0755,
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index eb185b3..30ad160 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -185,7 +185,7 @@ def oozie(is_server=False, upgrade_type=None):
      params.jdbc_driver_name == "org.postgresql.Driver" or \
      params.jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
     File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-      content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+      content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
     )
 
   oozie_ownership()
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index ea9de56..77b5429 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -71,7 +71,7 @@ def setup_ranger_admin(upgrade_type=None):
   copy_jdbc_connector()
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-    content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+    content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
     mode = 0644,
   )
 
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
index e97f9e5..c444934 100755
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
@@ -153,7 +153,7 @@ def kms(upgrade_type=None):
     copy_jdbc_connector()
 
     File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-      content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+      content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
       mode = 0644,
     )
 
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index 5ee959b..b1c63c3 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -284,7 +284,7 @@ class CheckHost(Script):
       if not jdbc_driver_mysql_name:
         no_jdbc_error_message = "The MySQL JDBC driver has not been set. Please ensure that you have executed 'ambari-server setup --jdbc-db=mysql --jdbc-driver=/path/to/jdbc_driver'."
       else:
-        jdbc_url = jdk_location + jdbc_driver_mysql_name
+        jdbc_url = CheckHost.build_url(jdk_location, jdbc_driver_mysql_name)
         jdbc_driver_class = JDBC_DRIVER_CLASS_MYSQL
         jdbc_name = jdbc_driver_mysql_name
     elif db_name == DB_ORACLE:
@@ -292,7 +292,7 @@ class CheckHost(Script):
       if not jdbc_driver_oracle_name:
         no_jdbc_error_message = "The Oracle JDBC driver has not been set. Please ensure that you have executed 'ambari-server setup --jdbc-db=oracle --jdbc-driver=/path/to/jdbc_driver'."
       else:
-        jdbc_url = jdk_location + jdbc_driver_oracle_name
+        jdbc_url = CheckHost.build_url(jdk_location, jdbc_driver_oracle_name)
         jdbc_driver_class = JDBC_DRIVER_CLASS_ORACLE
         jdbc_name = jdbc_driver_oracle_name
     elif db_name == DB_POSTGRESQL:
@@ -300,7 +300,7 @@ class CheckHost(Script):
       if not jdbc_driver_postgres_name:
         no_jdbc_error_message = "The Postgres JDBC driver has not been set. Please ensure that you have executed 'ambari-server setup --jdbc-db=postgres --jdbc-driver=/path/to/jdbc_driver'."
       else:
-        jdbc_url = jdk_location + jdbc_driver_postgres_name
+        jdbc_url = CheckHost.build_url(jdk_location, jdbc_driver_postgres_name)
         jdbc_driver_class = JDBC_DRIVER_CLASS_POSTGRESQL
         jdbc_name = jdbc_driver_postgres_name
     elif db_name == DB_MSSQL:
@@ -308,7 +308,7 @@ class CheckHost(Script):
       if not jdbc_driver_mssql_name:
         no_jdbc_error_message = "The MSSQL JDBC driver has not been set. Please ensure that you have executed 'ambari-server setup --jdbc-db=mssql --jdbc-driver=/path/to/jdbc_driver'."
       else:
-        jdbc_url = jdk_location + jdbc_driver_mssql_name
+        jdbc_url = CheckHost.build_url(jdk_location, jdbc_driver_mssql_name)
         jdbc_driver_class = JDBC_DRIVER_CLASS_MSSQL
         jdbc_name = jdbc_driver_mssql_name
     elif db_name == DB_SQLA:
@@ -316,7 +316,7 @@ class CheckHost(Script):
       if not jdbc_driver_sqla_name:
         no_jdbc_error_message = "The SQLAnywhere JDBC driver has not been set. Please ensure that you have executed 'ambari-server setup --jdbc-db=sqlanywhere --jdbc-driver=/path/to/jdbc_driver'."
       else:
-        jdbc_url = jdk_location + jdbc_driver_sqla_name
+        jdbc_url = CheckHost.build_url(jdk_location, jdbc_driver_sqla_name)
         jdbc_driver_class = JDBC_DRIVER_CLASS_SQLA
         jdbc_name = jdbc_driver_sqla_name
     else: no_jdbc_error_message = format("'{db_name}' database type not supported.")
@@ -330,7 +330,7 @@ class CheckHost(Script):
     user_name = config['commandParams']['user_name']
     user_passwd = config['commandParams']['user_passwd']
     agent_cache_dir = os.path.abspath(config["hostLevelParams"]["agentCacheDir"])
-    check_db_connection_url = jdk_location + check_db_connection_jar_name
+    check_db_connection_url = CheckHost.build_url(jdk_location, check_db_connection_jar_name)
     jdbc_path = os.path.join(agent_cache_dir, jdbc_name)
     class_path_delimiter = ":"
     if db_name == DB_SQLA:
@@ -362,7 +362,7 @@ class CheckHost(Script):
     # download and install java if it doesn't exists
     if not os.path.isfile(java_exec):
       jdk_name = config['commandParams']['jdk_name']
-      jdk_url = "{0}/{1}".format(jdk_location, jdk_name)
+      jdk_url = CheckHost.build_url(jdk_location, jdk_name)
       jdk_download_target = os.path.join(agent_cache_dir, jdk_name)
       java_dir = os.path.dirname(java_home)
       try:
@@ -426,7 +426,7 @@ class CheckHost(Script):
       download_file(jdbc_url, jdbc_path)
       if db_name == DB_MSSQL and OSCheck.is_windows_family():
         jdbc_auth_path = os.path.join(agent_cache_dir, JDBC_AUTH_SYMLINK_MSSQL)
-        jdbc_auth_url = jdk_location + JDBC_AUTH_SYMLINK_MSSQL
+        jdbc_auth_url = CheckHost.build_url(jdk_location, JDBC_AUTH_SYMLINK_MSSQL)
         download_file(jdbc_auth_url, jdbc_auth_path)
       elif db_name == DB_SQLA:
         # unpack tar.gz jdbc which was donaloaded
@@ -526,5 +526,21 @@ class CheckHost(Script):
 
     return last_agent_env_check_structured_output
 
+  @staticmethod
+  def build_url(base_url, path):
+    """
+   Builds a URL by appending a relative path to a base URL, ensuring additional /'s are not added
+   between the two parts.
+
+   :param base_url: a base URL
+   :param path: a relative path
+   :return: the resulting URL
+   """
+
+    url = base_url[0:-1] if base_url and base_url.endswith('/') else base_url
+    url = url + '/'
+    url = url + (path[1:] if path and path.startswith('/') else path)
+    return url
+
 if __name__ == "__main__":
   CheckHost().execute()
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py
index 2e382ff..504a6cb 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py
@@ -68,7 +68,7 @@ def hive(name=None):
 
   cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf -x \"\" "
                "--retry 5 "
-               "{jdk_location}{check_db_connection_jar_name} "
+               "{jdk_location}/{check_db_connection_jar_name} "
                "-o {check_db_connection_jar_name}'")
 
   Execute(cmd,
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py
index db86bc1..7cc69f8 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py
@@ -84,7 +84,7 @@ def oozie(is_server=False # TODO: see if see can remove this
      params.jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
     Execute(format("/bin/sh -c 'cd /usr/lib/ambari-agent/ &&\
     curl -kf -x \"\" \
-    --retry 5 {jdk_location}{check_db_connection_jar_name}\
+    --retry 5 {jdk_location}/{check_db_connection_jar_name}\
      -o {check_db_connection_jar_name}'"),
       not_if  = format("[ -f {check_db_connection_jar} ]"),
       environment=environment
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive.py
index 6d3906d..f577150 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/package/scripts/hive.py
@@ -250,7 +250,7 @@ def hive(name=None):
     jdbc_connector()
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-       content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+       content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
        mode = 0644,
   )
 
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie.py
index 6cd2b71..43db1ec 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/OOZIE/package/scripts/oozie.py
@@ -94,7 +94,7 @@ def oozie(is_server=False):
      params.jdbc_driver_name == "org.postgresql.Driver" or \
      params.jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
     File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-      content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+      content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
     )
   pass
 
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/OOZIE/package/scripts/oozie.py
index 0575805..4f5baee 100644
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/OOZIE/package/scripts/oozie.py
@@ -184,7 +184,7 @@ def oozie(is_server=False, upgrade_type=None):
      params.jdbc_driver_name == "org.postgresql.Driver" or \
      params.jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
     File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-      content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+      content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
     )
   pass
 
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
index f451a65..7ed3026 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
@@ -257,7 +257,7 @@ def hive(name=None):
     jdbc_connector(params.hive_jdbc_target, params.hive_previous_jdbc_jar)
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-       content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+       content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
        mode = 0644,
   )
 
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/package/scripts/oozie.py
index 0459432..20f332d 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/OOZIE/package/scripts/oozie.py
@@ -95,7 +95,7 @@ def oozie(is_server=False):
      params.jdbc_driver_name == "org.postgresql.Driver" or \
      params.jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
     File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-      content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+      content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
     )
   pass
 
diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/package/scripts/setup_ranger_xml.py
index 2a2cacc..6669dd9 100755
--- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/package/scripts/setup_ranger_xml.py
+++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/RANGER/package/scripts/setup_ranger_xml.py
@@ -70,7 +70,7 @@ def setup_ranger_admin(upgrade_type=None):
 #    ranger_conf = format("/usr/iop/current/ranger-admin/conf")
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-    content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+    content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
     mode = 0644,
   )
 
diff --git a/ambari-server/src/test/python/TestResourceFilesKeeper.py b/ambari-server/src/test/python/TestResourceFilesKeeper.py
index 9d685ee..11867c4 100644
--- a/ambari-server/src/test/python/TestResourceFilesKeeper.py
+++ b/ambari-server/src/test/python/TestResourceFilesKeeper.py
@@ -59,7 +59,7 @@ class TestResourceFilesKeeper(TestCase):
                                     ResourceFilesKeeper.PACKAGE_DIR)
 
   if get_platform() != PLATFORM_WINDOWS:
-    DUMMY_UNCHANGEABLE_PACKAGE_HASH="11c9ed5f7987b41ce5d7adaedd6dd08c9cc9b418"
+    DUMMY_UNCHANGEABLE_PACKAGE_HASH="c4ef4816f727010c3e1ef110cd7c9fe6bd69f38e"
   else:
     DUMMY_UNCHANGEABLE_PACKAGE_HASH="2e438f4f9862420ed8930a56b8809b8aca359e87"
   DUMMY_HASH="dummy_hash"
diff --git a/ambari-server/src/test/python/common-services/configs/hawq_default.json b/ambari-server/src/test/python/common-services/configs/hawq_default.json
index 1b6fafb..2e40d12 100644
--- a/ambari-server/src/test/python/common-services/configs/hawq_default.json
+++ b/ambari-server/src/test/python/common-services/configs/hawq_default.json
@@ -7,7 +7,7 @@
     "role": "HAWQ_SERVICE_CHECK",
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "stack_name": "PHD",
         "stack_version": "3.3",
         "jdk_name": "jdk-8u60-linux-x64.tar.gz"
diff --git a/ambari-server/src/test/python/common-services/configs/hive_default.json b/ambari-server/src/test/python/common-services/configs/hive_default.json
index 2cd0d11..101f27b 100644
--- a/ambari-server/src/test/python/common-services/configs/hive_default.json
+++ b/ambari-server/src/test/python/common-services/configs/hive_default.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json b/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json
index d85dbfe..e7a480e 100644
--- a/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json
+++ b/ambari-server/src/test/python/common-services/configs/hive_unsupported_jdbc_type.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/common-services/configs/pxf_default.json b/ambari-server/src/test/python/common-services/configs/pxf_default.json
index 90d8e7c..d136734 100644
--- a/ambari-server/src/test/python/common-services/configs/pxf_default.json
+++ b/ambari-server/src/test/python/common-services/configs/pxf_default.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json b/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json
index b360c07..fb3673e 100644
--- a/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json
+++ b/ambari-server/src/test/python/common-services/configs/ranger_admin_default.json
@@ -4,7 +4,7 @@
   "hostname": "c6401.ambari.apache.org",
   "hostLevelParams": {
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json b/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json
index aa620a4..e84f0c6 100644
--- a/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json
+++ b/ambari-server/src/test/python/common-services/configs/ranger_admin_unsupported_db_flavor.json
@@ -4,7 +4,7 @@
   "hostname": "c6401.ambari.apache.org",
   "hostLevelParams": {
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/common-services/configs/ranger_kms_default.json b/ambari-server/src/test/python/common-services/configs/ranger_kms_default.json
index b6de743..284ceba 100644
--- a/ambari-server/src/test/python/common-services/configs/ranger_kms_default.json
+++ b/ambari-server/src/test/python/common-services/configs/ranger_kms_default.json
@@ -193,14 +193,14 @@
     "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
     "host_sys_prepped": "false",
     "ambari_db_rca_username": "mapred",
-    "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+    "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
     "agent_stack_retry_count": "5",
     "stack_version": "2.5",
     "jdk_name": "jdk-8u60-linux-x64.tar.gz",
     "ambari_db_rca_driver": "org.postgresql.Driver",
     "java_home": "/usr/jdk64/jdk1.7.0_45",
     "repository_version_id": "1",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "not_managed_hdfs_path_list": "[\"/tmp\"]",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "java_version": "8",
@@ -211,7 +211,7 @@
     "agentCacheDir": "/var/lib/ambari-agent/cache",
     "ambari_db_rca_password": "mapred",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-    "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+    "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
     "db_driver_filename": "mysql-connector-java.jar",
     "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
     "clientsToUpdateConfigs": "[\"*\"]"
diff --git a/ambari-server/src/test/python/common-services/configs/ranger_kms_unsupported_db_flavor.json b/ambari-server/src/test/python/common-services/configs/ranger_kms_unsupported_db_flavor.json
index 22a3a44..31919b9 100644
--- a/ambari-server/src/test/python/common-services/configs/ranger_kms_unsupported_db_flavor.json
+++ b/ambari-server/src/test/python/common-services/configs/ranger_kms_unsupported_db_flavor.json
@@ -193,14 +193,14 @@
     "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
     "host_sys_prepped": "false",
     "ambari_db_rca_username": "mapred",
-    "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+    "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
     "agent_stack_retry_count": "5",
     "stack_version": "2.5",
     "jdk_name": "jdk-8u60-linux-x64.tar.gz",
     "ambari_db_rca_driver": "org.postgresql.Driver",
     "java_home": "/usr/jdk64/jdk1.7.0_45",
     "repository_version_id": "1",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "not_managed_hdfs_path_list": "[\"/tmp\"]",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "java_version": "8",
@@ -211,7 +211,7 @@
     "agentCacheDir": "/var/lib/ambari-agent/cache",
     "ambari_db_rca_password": "mapred",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-    "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+    "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
     "db_driver_filename": "mysql-connector-java.jar",
     "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
     "clientsToUpdateConfigs": "[\"*\"]"
diff --git a/ambari-server/src/test/python/common-services/configs/sqoop_default.json b/ambari-server/src/test/python/common-services/configs/sqoop_default.json
index 129d5fb..a83ac8e 100644
--- a/ambari-server/src/test/python/common-services/configs/sqoop_default.json
+++ b/ambari-server/src/test/python/common-services/configs/sqoop_default.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json b/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json
index 415b1d8..5b744bf 100644
--- a/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json
+++ b/ambari-server/src/test/python/common-services/configs/sqoop_unsupported_jdbc_driver.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/custom_actions/TestCheckHost.py b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
index 2a4d944..f28d3ef 100644
--- a/ambari-server/src/test/python/custom_actions/TestCheckHost.py
+++ b/ambari-server/src/test/python/custom_actions/TestCheckHost.py
@@ -447,3 +447,11 @@ class TestCheckHost(TestCase):
 
     self.assertEquals(structured_out_mock.call_args[0][0], {'db_connection_check': {'message': '\'unsupported_db\' database type not supported.', 'exit_code': 1}})
 
+  @patch.object(OSCheck, "os_distribution", new=MagicMock(return_value=os_distro_value))
+  def testBuildUrl(self, ):
+    checkHost = CheckHost()
+
+    self.assertEquals('base_url/path', checkHost.build_url('base_url', 'path'))
+    self.assertEquals('base_url/path', checkHost.build_url('base_url/', 'path'))
+    self.assertEquals('base_url/path', checkHost.build_url('base_url/', '/path'))
+    self.assertEquals('base_url/path', checkHost.build_url('base_url', '/path'))
diff --git a/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json
index e5b4cb5..902c5d3 100644
--- a/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json
+++ b/ambari-server/src/test/python/custom_actions/configs/install_packages_config.json
@@ -7,13 +7,13 @@
     "hostLevelParams": {
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://0b3.vm:8080/resources/",
+        "jdk_location": "http://0b3.vm:8080/resources",
         "ambari_db_rca_password": "mapred",
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://0b3.vm/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-        "oracle_jdbc_url": "http://0b3.vm:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://0b3.vm:8080/resources/ojdbc6.jar",
         "stack_version": "2.1",
         "stack_name": "HDP",
         "db_name": "ambari",
@@ -21,7 +21,7 @@
         "jdk_name": "jdk-7u67-linux-x64.tar.gz",
         "ambari_db_rca_username": "mapred",
         "db_driver_filename": "mysql-connector-java.jar",
-        "mysql_jdbc_url": "http://0b3.vm:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://0b3.vm:8080/resources/mysql-connector-java.jar"
     },
     "commandType": "EXECUTION_COMMAND",
     "roleParams": {
diff --git a/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json b/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json
index c5ca385..4a29928 100644
--- a/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json
+++ b/ambari-server/src/test/python/custom_actions/configs/install_packages_repository_file.json
@@ -7,13 +7,13 @@
     "hostLevelParams": {
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://0b3.vm:8080/resources/",
+        "jdk_location": "http://0b3.vm:8080/resources",
         "ambari_db_rca_password": "mapred",
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://0b3.vm/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-        "oracle_jdbc_url": "http://0b3.vm:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://0b3.vm:8080/resources/ojdbc6.jar",
         "stack_version": "2.1",
         "stack_name": "HDP",
         "db_name": "ambari",
@@ -21,7 +21,7 @@
         "jdk_name": "jdk-7u67-linux-x64.tar.gz",
         "ambari_db_rca_username": "mapred",
         "db_driver_filename": "mysql-connector-java.jar",
-        "mysql_jdbc_url": "http://0b3.vm:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://0b3.vm:8080/resources/mysql-connector-java.jar"
     },
     "commandType": "EXECUTION_COMMAND",
     "repositoryFile": {
diff --git a/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json b/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json
index cc4a626..5a0aae6 100644
--- a/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json
+++ b/ambari-server/src/test/python/custom_actions/configs/remove_previous_stacks.json
@@ -7,13 +7,13 @@
   "hostLevelParams": {
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://0b3.vm:8080/resources/",
+    "jdk_location": "http://0b3.vm:8080/resources",
     "ambari_db_rca_password": "mapred",
     "java_home": "/usr/jdk64/jdk1.7.0_67",
     "java_version": "8",
     "ambari_db_rca_url": "jdbc:postgresql://0b3.vm/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-    "oracle_jdbc_url": "http://0b3.vm:8080/resources//ojdbc6.jar",
+    "oracle_jdbc_url": "http://0b3.vm:8080/resources/ojdbc6.jar",
     "stack_version": "2.1",
     "stack_name": "HDP",
     "db_name": "ambari",
@@ -21,7 +21,7 @@
     "jdk_name": "jdk-7u67-linux-x64.tar.gz",
     "ambari_db_rca_username": "mapred",
     "db_driver_filename": "mysql-connector-java.jar",
-    "mysql_jdbc_url": "http://0b3.vm:8080/resources//mysql-connector-java.jar"
+    "mysql_jdbc_url": "http://0b3.vm:8080/resources/mysql-connector-java.jar"
   },
   "commandType": "SYSTEM",
   "serviceName": "null",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
index cf661c1..0708ddc 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_metastore.py
@@ -235,7 +235,7 @@ class TestHiveMetastore(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
@@ -361,7 +361,7 @@ class TestHiveMetastore(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
@@ -514,7 +514,7 @@ class TestHiveMetastore(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 3f61dbd..39f9a07 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -502,7 +502,7 @@ class TestHiveServer(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
@@ -721,7 +721,7 @@ class TestHiveServer(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
index 09c4227..5dd3f62 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py
@@ -290,7 +290,7 @@ class TestOozieServer(RMFTestCase):
                               recursive_ownership = True,
     )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-        content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+        content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
     )
     self.assertResourceCalled('Execute', ('cp',
      '--remove-destination',
@@ -518,7 +518,7 @@ class TestOozieServer(RMFTestCase):
                               recursive_ownership = True,
                               )
     self.assertResourceCalled('File', '/tmp/sqla-client-jdbc.tar.gz',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//sqla-client-jdbc.tar.gz'),
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/sqla-client-jdbc.tar.gz'),
                               )
     self.assertResourceCalled('Execute', ('tar', '-xvf', '/tmp/sqla-client-jdbc.tar.gz', '-C', '/tmp'),
                               sudo = True,
@@ -1614,7 +1614,7 @@ class TestOozieServer(RMFTestCase):
       target = RMFTestCase.TARGET_COMMON_SERVICES )
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar') )
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar') )
 
     self.assertResourceCalled('Execute', ('cp', '--remove-destination', '/tmp/mysql-connector-java.jar',
       '/usr/hdp/2.3.0.0-1234/oozie/libext/mysql-connector-java.jar'),
diff --git a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
index 053d44a..5b144b7 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/SQOOP/test_sqoop.py
@@ -85,11 +85,11 @@ class TestSqoop(RMFTestCase):
                               to = '/usr/share/java/mysql-connector-java.jar',
                               )
     self.assertResourceCalled('File', '/usr/lib/sqoop/lib/test-postgres-jdbc.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//test-postgres-jdbc.jar'),
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/test-postgres-jdbc.jar'),
                               mode = 0644,
                               )
     self.assertResourceCalled('File', '/usr/lib/sqoop/lib/oracle-jdbc-driver.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//oracle-jdbc-driver.jar'),
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/oracle-jdbc-driver.jar'),
                               mode = 0644,
                               )
     self.assertResourceCalled('Directory', '/usr/lib/sqoop/conf',
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
index f928073..9dd1249 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/altfs_plus_hdfs.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
index 0b5ba6a..b72adf1 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/client-upgrade.json
@@ -50,14 +50,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://10.0.0.15:8080/resources/", 
+        "jdk_location": "http://10.0.0.15:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.15:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.0.0-2041\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"de [...]
         "group_list": "[\"hadoop\",\"users\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -69,7 +69,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"oozie\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"yarn\"]", 
-        "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://10.0.0.15:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
index adab92f..dd4a5d3 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 4ebda10..b8cc404 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -7,7 +7,7 @@
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
         "agentCacheDir": "/var/lib/ambari-agent/cache",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"},{\"baseUrl\":\"http://packages.elastic.co/kibana/4.5/debian\",\"osType\":\"ubuntu14\",\"repoId\":\"KIBANA-4.5\",\"repoName\":\"KIBANA\",\"distribution\":\"stable\",\"components\":\"com1,com2\",\"defaultBaseUrl\":\"http:// [...]
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
index e81fe9e..a1a6057 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
index f3e8dc3..d81b45e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_ams_embedded.json
@@ -5,7 +5,7 @@
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agentCacheDir": "/var/lib/ambari-agent/cache",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
index 8c17e86..69d2338 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json
index 7b0f78d..f9d3091 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json
index 01f0efc..1593da2 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_nn_ha_2.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json
index 0cbd322..874fc78 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_hive_non_hdfs.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
index cfcf5e1..89763f1 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
index 7db73ab..7bbe960 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_oozie_mysql.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json
index f50a207..80ca61f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_update_exclude_file_only.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json
index c1eb868..dd0e9dc 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_with_bucket.json
@@ -7,7 +7,7 @@
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
         "agentCacheDir": "/var/lib/ambari-agent/cache",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_dont_manage.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_dont_manage.json
index ac3f86d..d109e85 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_dont_manage.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_dont_manage.json
@@ -28,7 +28,7 @@
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
     "agentCacheDir": "/var/lib/ambari-agent/cache",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_manage.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_manage.json
index aa2d3d5..15e4d58 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_manage.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_manage.json
@@ -28,7 +28,7 @@
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
     "agentCacheDir": "/var/lib/ambari-agent/cache",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
index c99d10b..67a3010 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json
index 1a4d676..cd7df80 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_only.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
index b197fde..52b1ace 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json
index 841dfda..362f757 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_active_node.json
@@ -7,11 +7,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", 
         "stack_version": "2.0",
@@ -22,7 +22,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json
index df09021..b71d2e9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node.json
@@ -7,11 +7,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", 
         "stack_version": "2.0",
@@ -22,7 +22,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json
index a0a8f36..5ac9be6 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start.json
@@ -7,11 +7,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", 
         "stack_version": "2.0",
@@ -22,7 +22,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json
index a3176bd..f28fa96 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_bootstrap_standby_node_initial_start_dfs_nameservices.json
@@ -7,11 +7,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", 
         "stack_version": "2.0",
@@ -22,7 +22,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
index 888886e..35fe190 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
@@ -7,11 +7,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", 
         "stack_version": "2.0",
@@ -22,7 +22,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
index f06fae3..d746738 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
@@ -7,11 +7,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"lzo\"},{\"type\":\"rpm\",\"name\":\"hadoop\"},{\"type\":\"rpm\",\"name\":\"hadoop-libhdfs\"},{\"type\":\"rpm\",\"name\":\"hadoop-lzo\"},{\"type\":\"rpm\",\"name\":\"hadoop-lzo-native\"},{\"type\":\"rpm\",\"name\":\"snappy\"},{\"type\":\"rpm\",\"name\":\"snappy-devel\"},{\"type\":\"rpm\",\"name\":\"ambari-log4j\"}]", 
         "stack_version": "2.0",
@@ -22,7 +22,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
index c5ffcc9..a18ab7d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-2.2.json
@@ -49,14 +49,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://10.0.0.15:8080/resources/", 
+        "jdk_location": "http://10.0.0.15:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.15:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.0.0-2041\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"de [...]
         "group_list": "[\"hadoop\",\"nobody\",\"users\"]", 
         "package_list": "[{\"name\":\"hbase_2_2_*\"}]", 
@@ -68,7 +68,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"nobody\",\"oozie\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"yarn\"]", 
-        "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar", 
+        "mysql_jdbc_url": "http://10.0.0.15:8080/resources/mysql-connector-java.jar",
         "clientsToUpdateConfigs": "[\"*\"]"
     }, 
     "commandType": "EXECUTION_COMMAND", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
index 6f3d4ee..82fe020 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-check-2.2.json
@@ -49,13 +49,13 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://10.0.0.15:8080/resources/", 
+        "jdk_location": "http://10.0.0.15:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.15:8080/resources/ojdbc6.jar",
         "stack_version": "2.2", 
         "stack_name": "HDP", 
         "db_name": "ambari", 
@@ -64,7 +64,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://10.0.0.15:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json
index cf4094f..5cf868c 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-preupgrade.json
@@ -9,13 +9,13 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://10.0.0.15:8080/resources/", 
+        "jdk_location": "http://10.0.0.15:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.15:8080/resources/ojdbc6.jar",
         "stack_version": "2.2", 
         "stack_name": "HDP", 
         "db_name": "ambari", 
@@ -24,7 +24,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://10.0.0.15:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json
index 114bdff..62e779d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2-phoenix.json
@@ -49,14 +49,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://10.0.0.15:8080/resources/", 
+        "jdk_location": "http://10.0.0.15:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.15:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.0.0-2041\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"de [...]
         "group_list": "[\"hadoop\",\"nobody\",\"users\"]", 
         "package_list": "[{\"name\":\"hbase_2_2_*\"}]", 
@@ -68,7 +68,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"nobody\",\"oozie\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"yarn\"]", 
-        "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar", 
+        "mysql_jdbc_url": "http://10.0.0.15:8080/resources/mysql-connector-java.jar",
         "clientsToUpdateConfigs": "[\"*\"]"
     }, 
     "commandType": "EXECUTION_COMMAND", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
index d82ca99..c573252 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase-rs-2.2.json
@@ -49,14 +49,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://10.0.0.15:8080/resources/", 
+        "jdk_location": "http://10.0.0.15:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.15:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.0.0-2041\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"de [...]
         "group_list": "[\"hadoop\",\"nobody\",\"users\"]", 
         "package_list": "[{\"name\":\"hbase_2_2_*\"}]", 
@@ -68,7 +68,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"nobody\",\"oozie\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"yarn\"]", 
-        "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar", 
+        "mysql_jdbc_url": "http://10.0.0.15:8080/resources/mysql-connector-java.jar",
         "clientsToUpdateConfigs": "[\"*\"]"
     }, 
     "commandType": "EXECUTION_COMMAND", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json
index 52a1fde..cd63a44 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_no_phx.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json
index beb1ab5..dc657ea 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/hbase_with_phx.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json
index 3440085..f3ca95d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu.json
@@ -44,16 +44,16 @@
         "host_sys_prepped": "false", 
         "ambari_db_rca_username": "mapred",
         "jdk_name": "jdk-7u45-linux-x64.tar.gz", 
-        "mysql_jdbc_url": "http://10.0.0.28:8080/resources//mysql-connector-java.jar", 
+        "mysql_jdbc_url": "http://10.0.0.28:8080/resources/mysql-connector-java.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.7.0-2816\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.6.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.8.0\",\"baseSaved\":true},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\" [...]
         "custom_command": "RESTART", 
         "stack_version": "2.3", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "java_home": "/usr/jdk64/jdk1.7.0_45", 
-        "jdk_location": "http://10.0.0.28:8080/resources/", 
+        "jdk_location": "http://10.0.0.28:8080/resources",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.28/ambarirca", 
         "java_version": "7", 
-        "oracle_jdbc_url": "http://10.0.0.28:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.28:8080/resources/ojdbc6.jar",
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
         "ambari_db_rca_password": "mapred", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json
index 90b2493..2f0c13d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_eu_standby.json
@@ -44,16 +44,16 @@
         "host_sys_prepped": "false", 
         "ambari_db_rca_username": "mapred",
         "jdk_name": "jdk-7u45-linux-x64.tar.gz", 
-        "mysql_jdbc_url": "http://10.0.0.28:8080/resources//mysql-connector-java.jar", 
+        "mysql_jdbc_url": "http://10.0.0.28:8080/resources/mysql-connector-java.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.7.0-2816\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.6.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.8.0\",\"baseSaved\":true},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\" [...]
         "custom_command": "RESTART", 
         "stack_version": "2.3", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "java_home": "/usr/jdk64/jdk1.7.0_45", 
-        "jdk_location": "http://10.0.0.28:8080/resources/", 
+        "jdk_location": "http://10.0.0.28:8080/resources",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.28/ambarirca", 
         "java_version": "7", 
-        "oracle_jdbc_url": "http://10.0.0.28:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.28:8080/resources/ojdbc6.jar",
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
         "ambari_db_rca_password": "mapred", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json
index f4b8a70..19e6eba 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/nn_ru_lzo.json
@@ -17,14 +17,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://10.0.0.15:8080/resources/", 
+        "jdk_location": "http://10.0.0.15:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.15:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.2.0-2422\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"baseSaved\":true},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\" [...]
         "group_list": "[\"hadoop\",\"users\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -36,7 +36,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"mapred\",\"ambari-qa\",\"zookeeper\",\"tez\",\"false\",\"hdfs\",\"yarn\"]", 
-        "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://10.0.0.15:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json b/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json
index 4ffa29f..7dd841a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/oozie_existing_sqla.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json
index b163a61..a7ca101 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ranger-namenode-start.json
@@ -39,13 +39,13 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://hw10897.ix:8080/resources/",
+        "jdk_location": "http://hw10897.ix:8080/resources",
         "ambari_db_rca_password": "mapred",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://hw10897.ix/ambarirca",
         "stack_name": "HDP",
-        "oracle_jdbc_url": "http://hw10897.ix:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://hw10897.ix:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-2.2.0.0/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"baseSaved\":true},{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-UTILS-1.1.0.20/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\ [...]
         "group_list": "[\"hadoop\",\"users\",\"knox\",\"ranger\"]",
         "agentCacheDir": "/var/lib/ambari-agent/cache",
@@ -56,7 +56,7 @@
         "ambari_db_rca_username": "mapred",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"oozie\",\"hive\",\"root\",\"ambari-qa\",\"flume\",\"hdfs\",\"knox\",\"ranger\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"rangerlogger\",\"kafka\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\",\"ams\",\"rangeradmin\"]",
-        "mysql_jdbc_url": "http://hw10897.ix:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://hw10897.ix:8080/resources/mysql-connector-java.jar"
     },
     "commandType": "EXECUTION_COMMAND",
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json
index b662bd7..d1891e8 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_default.json
@@ -6,21 +6,21 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/lib/jvm/java-1.6.0-openjdk.x86_64",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "stack_name": "HDP", 
         "custom_command": "REBALANCEHDFS", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.1.3.0\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.1\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"REPLACE_WITH_CENTOS6_URL\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.1.3.0\"},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos6\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.17\",\"repoName\":\"HDP-UTILS\",\"def [...]
         "stack_version": "2.1", 
         "db_name": "ambari7", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "BACKGROUND_EXECUTION_COMMAND", 
     "roleParams": {
@@ -29,7 +29,7 @@
     "serviceName": "HDFS", 
     "role": "NAMENODE", 
     "commandParams": {
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "service_package_folder": "HDP/2.0.6/services/HDFS/package", 
         "script": "scripts/namenode.py", 
         "hooks_folder": "HDP/2.0.6/hooks", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json
index ba10950..02acd31 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/rebalancehdfs_secured.json
@@ -6,21 +6,21 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/lib/jvm/java-1.6.0-openjdk.x86_64",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "stack_name": "HDP", 
         "custom_command": "REBALANCEHDFS", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.1.3.0\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.1\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"REPLACE_WITH_CENTOS6_URL\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.1.3.0\"},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.17/repos/centos6\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.17\",\"repoName\":\"HDP-UTILS\",\"def [...]
         "stack_version": "2.1", 
         "db_name": "ambari7", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "BACKGROUND_EXECUTION_COMMAND", 
     "roleParams": {
@@ -29,7 +29,7 @@
     "serviceName": "HDFS", 
     "role": "NAMENODE", 
     "commandParams": {
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "service_package_folder": "HDP/2.0.6/services/HDFS/package", 
         "script": "scripts/namenode.py", 
         "hooks_folder": "HDP/2.0.6/hooks", 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index cefd9f6..c838cc4 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -6,11 +6,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]",
         "stack_version": "2.0",
@@ -21,7 +21,7 @@
         "ambari_db_rca_username": "mapred",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "custom_mysql_jdbc_name" : "mysql-connector-java.jar",
         "custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
         "custom_postgres_jdbc_name" : "test-postgres-jdbc.jar"
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
index bf4ff12..7182a0f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
@@ -6,11 +6,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", 
         "stack_version": "2.0",
@@ -21,7 +21,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
index a0dd539..4da170e 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
@@ -4,11 +4,11 @@
     "hostname": "c6401.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "unlimited_key_jce_required" : "true",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", 
         "stack_version": "2.0",
@@ -19,7 +19,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
index 0e0c7e0..87d4cde 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
@@ -6,12 +6,12 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "current_version" : "2.2.4.2-1234",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]",
         "stack_version": "2.0",
@@ -22,7 +22,7 @@
         "ambari_db_rca_username": "mapred",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "custom_mysql_jdbc_name" : "mysql-connector-java.jar",
         "custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
         "custom_postgres_jdbc_name" : "test-postgres-jdbc.jar"
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
index e92169c..924c484 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
@@ -6,12 +6,12 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "current_version" : "2.2.4.2-1234",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-    "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+    "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
     "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
     "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]",
     "stack_version": "2.0",
@@ -22,7 +22,7 @@
     "ambari_db_rca_username": "mapred",
     "java_home": "/usr/jdk64/jdk1.7.0_45",
     "java_version": "8",
-    "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+    "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
     "custom_mysql_jdbc_name" : "mysql-connector-java.jar",
     "custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
     "custom_postgres_jdbc_name" : "test-postgres-jdbc.jar"
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json b/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json
index 4fa7eab..374dcc1 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/zk-service_check_2.2.json
@@ -12,13 +12,13 @@
     "hostname": "c6403.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://192.168.64.1:8080/resources/",
+        "jdk_location": "http://192.168.64.1:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://192.168.64.1/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://192.168.64.1:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://192.168.64.1:8080/resources/ojdbc6.jar",
         "stack_version": "2.2", 
         "stack_name": "HDP", 
         "db_name": "ambari", 
@@ -27,7 +27,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "mysql_jdbc_url": "http://192.168.64.1:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://192.168.64.1:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
index 72f838c..c93d447 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
@@ -196,7 +196,7 @@ class TestHookBeforeInstall(RMFTestCase):
                               create_parents = True,
                               )
     self.assertResourceCalled('File', '/tmp/jdk-7u67-linux-x64.tar.gz',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//jdk-7u67-linux-x64.tar.gz'),
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/jdk-7u67-linux-x64.tar.gz'),
                               not_if = 'test -f /tmp/jdk-7u67-linux-x64.tar.gz',
                               )
     self.assertResourceCalled('File', '/tmp/jdk-7u67-linux-x64.tar.gz',
diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
index 0c9380d..bb51a16 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py
@@ -53,7 +53,7 @@ class TestFalconServer(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/usr/hdp/current/falcon-server/server/webapp/falcon/WEB-INF/lib/je-5.0.73.jar',
-      content=DownloadSource('http://c6401.ambari.apache.org:8080/resources//je-5.0.73.jar'),
+      content=DownloadSource('http://c6401.ambari.apache.org:8080/resources/je-5.0.73.jar'),
       mode=0755
     )
 
diff --git a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
index 2a9464b..259b144 100644
--- a/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
+++ b/ambari-server/src/test/python/stacks/2.1/HIVE/test_hive_metastore.py
@@ -262,7 +262,7 @@ class TestHiveMetastore(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
@@ -376,7 +376,7 @@ class TestHiveMetastore(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
@@ -604,7 +604,7 @@ class TestHiveMetastore(RMFTestCase):
         sudo = True)
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-        content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+        content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
 
     self.assertResourceCalled('Execute', ('cp',
      '--remove-destination',
@@ -678,7 +678,7 @@ class TestHiveMetastore(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://10.0.0.13:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://10.0.0.13:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
@@ -764,7 +764,7 @@ class TestHiveMetastore(RMFTestCase):
 
     self.assertResourceCalled('File',
                               '/tmp/sqla-client-jdbc.tar.gz',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//sqla-client-jdbc.tar.gz')
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/sqla-client-jdbc.tar.gz')
                               )
 
     self.assertResourceCalled('Execute',
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json
index 013bb8b..b9ef82d 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/client-upgrade.json
@@ -50,14 +50,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://10.0.0.15:8080/resources/", 
+        "jdk_location": "http://10.0.0.15:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.15/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://10.0.0.15:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.15:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.2.0.0-2041\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-UTILS\",\"de [...]
         "group_list": "[\"hadoop\",\"users\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -69,7 +69,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"oozie\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"yarn\"]", 
-        "mysql_jdbc_url": "http://10.0.0.15:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://10.0.0.15:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
index 05330a0..765c989 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default-storm-start.json
@@ -46,13 +46,13 @@
     "hostname": "c6402.ambari.apache.org",
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\"},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\":\"redh [...]
         "group_list": "[\"hadoop\",\"users\"]",
         "package_list": "[{\"name\":\"storm_2_2_0_0_*\"}]",
@@ -64,7 +64,7 @@
         "ambari_db_rca_username": "mapred",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"ambari-qa\",\"zookeeper\",\"hdfs\",\"storm\"]",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     },
     "commandType": "EXECUTION_COMMAND",
     "roleParams": {},
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index 536074e..aae2339 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -19,7 +19,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json b/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json
index 3bf8b6d..392e142 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/hive-metastore-upgrade.json
@@ -31,16 +31,16 @@
         "host_sys_prepped": "false", 
         "ambari_db_rca_username": "mapred",
         "jdk_name": "jdk-7u45-linux-x64.tar.gz", 
-        "mysql_jdbc_url": "http://10.0.0.13:8080/resources//mysql-connector-java.jar", 
+        "mysql_jdbc_url": "http://10.0.0.13:8080/resources/mysql-connector-java.jar",
         "repo_info": "[{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-2.3.0.0-2557\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.3\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.3.4.0-3360\",\"baseSaved\":true},{\"baseUrl\":\"http://repos.ambari.apache.org/hdp/HDP-UTILS-1.1.0.20\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1. [...]
         "custom_command": "RESTART", 
         "stack_version": "2.3", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "java_home": "/usr/jdk64/jdk1.7.0_45", 
-        "jdk_location": "http://10.0.0.13:8080/resources/", 
+        "jdk_location": "http://10.0.0.13:8080/resources",
         "ambari_db_rca_url": "jdbc:postgresql://10.0.0.13/ambarirca", 
         "java_version": "7", 
-        "oracle_jdbc_url": "http://10.0.0.13:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://10.0.0.13:8080/resources/ojdbc6.jar",
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
         "ambari_db_rca_password": "mapred", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json
index 6d7fdd1..75b802d 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json
@@ -45,13 +45,13 @@
     "hostname": "c6402.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.2.0.0\"},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\":\"redh [...]
         "group_list": "[\"hadoop\",\"users\"]", 
         "package_list": "[{\"name\":\"storm_2_2_0_0_*\"}]", 
@@ -63,7 +63,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"ambari-qa\",\"zookeeper\",\"hdfs\",\"storm\"]", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
index e2c22be..99f7ee2 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
@@ -19,11 +19,11 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]", 
         "package_list": "[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]", 
         "stack_version": "2.1",
@@ -34,7 +34,7 @@
         "ambari_db_rca_username": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "db_name": "ambari"
     }, 
     "commandType": "EXECUTION_COMMAND", 
diff --git a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py
index 2936258..702df16 100644
--- a/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py
+++ b/ambari-server/src/test/python/stacks/2.2/RANGER/test_ranger_admin.py
@@ -122,7 +122,7 @@ class TestRangerAdmin(RMFTestCase):
     self.assertResourceCalled('Execute', 'mysql -u root --password=aa -h localhost  -s -e "select version();"',logoutput = True,
                               environment = {})
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-        content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+        content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
         mode = 0644
     )
     self.assertResourceCalled('Execute', ('cp',
@@ -167,7 +167,7 @@ class TestRangerAdmin(RMFTestCase):
     self.assertResourceCalled('Execute', 'mysql -u root --password=rootpassword -h localhost  -s -e "select version();"',logoutput = True,
                               environment = {})
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-        content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+        content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
         mode = 0644
     )
     self.assertResourceCalled('Execute', ('cp',
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default.json b/ambari-server/src/test/python/stacks/2.2/configs/default.json
index bcb021b..e8e1461 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/default.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json b/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json
index 8c168ca..b042f99 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/default_custom_path_config.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org",
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json
index 7ded3a0..1cbcd82 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/falcon-upgrade.json
@@ -31,14 +31,14 @@
     "hostname": "c6402.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://hw10897.ix:8080/resources/",
+        "jdk_location": "http://hw10897.ix:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://hw10897.ix/ambarirca", 
         "stack_name": "HDP", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://hw10897.ix:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://hw10897.ix:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-2.2.0.0/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-UTILS-1.1.0.20/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-U [...]
         "group_list": "[\"hadoop\",\"nobody\",\"users\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -49,7 +49,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"nobody\",\"oozie\",\"hive\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"falcon\",\"yarn\",\"hcat\"]", 
-        "mysql_jdbc_url": "http://hw10897.ix:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://hw10897.ix:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json
index 7a29ea0..427e52d 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/hive-upgrade.json
@@ -38,14 +38,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://hw10897.ix:8080/resources/",
+        "jdk_location": "http://hw10897.ix:8080/resources",
         "ambari_db_rca_password": "mapred",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://hw10897.ix/ambarirca",
         "stack_name": "HDP",
         "custom_command": "RESTART",
-        "oracle_jdbc_url": "http://hw10897.ix:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://hw10897.ix:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-2.2.0.0/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-UTILS-1.1.0.20/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-U [...]
         "group_list": "[\"hadoop\",\"nobody\",\"users\"]",
         "agentCacheDir": "/var/lib/ambari-agent/cache",
@@ -56,7 +56,7 @@
         "ambari_db_rca_username": "mapred",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"nobody\",\"hive\",\"mapred\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"yarn\",\"hcat\"]",
-        "mysql_jdbc_url": "http://hw10897.ix:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://hw10897.ix:8080/resources/mysql-connector-java.jar"
     },
     "commandType": "EXECUTION_COMMAND",
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json
index 03068e5..f3f808d 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade-hdfs-secure.json
@@ -67,14 +67,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6406.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6406.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6406.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://c6406.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6406.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.1.0-2340\",\"baseSaved\":true},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\":\"redhat6\",\" [...]
         "group_list": "[\"hadoop\",\"users\",\"hdfs\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -86,7 +86,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"oozie\",\"hive\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"sqoop\",\"hcat\",\"yarn\",\"ams\"]", 
-        "mysql_jdbc_url": "http://c6406.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6406.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json
index 7f874cd..fe6b068 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/journalnode-upgrade.json
@@ -67,14 +67,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6406.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6406.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6406.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://c6406.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6406.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.1.0-2340\",\"baseSaved\":true},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\":\"redhat6\",\" [...]
         "group_list": "[\"hadoop\",\"users\",\"hdfs\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -86,7 +86,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"oozie\",\"hive\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"sqoop\",\"hcat\",\"yarn\",\"ams\"]", 
-        "mysql_jdbc_url": "http://c6406.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6406.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json
index c3e3f94..86eff5b 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/knox_upgrade.json
@@ -39,16 +39,16 @@
         "host_sys_prepped": "false", 
         "ambari_db_rca_username": "mapred",
         "jdk_name": "jdk-8u60-linux-x64.tar.gz", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar", 
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "repo_info": "[]", 
         "custom_command": "RESTART", 
         "stack_version": "2.3", 
         "ambari_db_rca_driver": "org.postgresql.Driver", 
         "java_home": "/usr/jdk64/jdk1.8.0_40", 
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "java_version": "8", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
         "ambari_db_rca_password": "mapred", 
         "jce_name": "jce_policy-8.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json
index fb561f7..40685e8 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-downgrade.json
@@ -34,14 +34,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://hw10897.ix:8080/resources/", 
+        "jdk_location": "http://hw10897.ix:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://hw10897.ix/ambarirca", 
         "stack_name": "HDP", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://hw10897.ix:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://hw10897.ix:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-2.2.0.0/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-UTILS-1.1.0.20/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-U [...]
         "group_list": "[\"hadoop\",\"nobody\",\"users\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -52,7 +52,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"nobody\",\"oozie\",\"hive\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"falcon\",\"yarn\",\"hcat\"]", 
-        "mysql_jdbc_url": "http://hw10897.ix:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://hw10897.ix:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json
index 4e9a62f..1e89228 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/oozie-upgrade.json
@@ -34,14 +34,14 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "stack_name": "HDP", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-2.2.0.0/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\"},{\"baseUrl\":\"http://repo.ambari.apache.org/hdp/centos6/HDP-UTILS-1.1.0.20/\",\"osType\":\"redhat6\",\"repoId\":\"HDP-UTILS-1.1.0.20\",\"repoName\":\"HDP-U [...]
         "group_list": "[\"hadoop\",\"nobody\",\"users\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -52,7 +52,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"nobody\",\"oozie\",\"hive\",\"mapred\",\"hbase\",\"ambari-qa\",\"zookeeper\",\"tez\",\"hdfs\",\"falcon\",\"yarn\",\"hcat\"]", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "custom_mysql_jdbc_name" : "mysql-connector-java.jar",
         "custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
         "custom_postgres_jdbc_name" : "test-postgres-jdbc.jar",
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
index 0ac9e78..a8626b4 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
@@ -37,13 +37,13 @@
     "hostname": "c6403.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "stack_version": "2.2", 
         "stack_name": "HDP", 
         "db_name": "ambari", 
@@ -52,7 +52,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json
index 151c886..12a891e 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org",
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json
index 64ee4b1..24bc2f0 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org",
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
index cbe8ebe..7fb7984 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
@@ -57,14 +57,14 @@
     "hostname": "c6408.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6407.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6407.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6407.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://c6407.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6407.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-2398\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-2442\",\"baseSaved\":true},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\ [...]
         "group_list": "[\"hadoop\",\"users\",\"ranger\",\"spark\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -76,7 +76,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"root\",\"ambari-qa\",\"hdfs\",\"ranger\",\"spark\",\"mapred\",\"tez\",\"zookeeper\",\"rangerlogger\",\"kafka\",\"yarn\",\"ams\",\"rangeradmin\"]", 
-        "mysql_jdbc_url": "http://c6407.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6407.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "custom_mysql_jdbc_name" : "mysql-connector-java.jar",
         "custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
         "custom_postgres_jdbc_name" : "test-postgres-jdbc.jar",
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
index dc4c43b..06e9c33 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
@@ -57,14 +57,14 @@
     "hostname": "c6408.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6407.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6407.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "java_version": "8",
         "ambari_db_rca_url": "jdbc:postgresql://c6407.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://c6407.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6407.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-2398\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-2442\",\"baseSaved\":true},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\ [...]
         "group_list": "[\"hadoop\",\"users\",\"ranger\",\"spark\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -76,7 +76,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"root\",\"ambari-qa\",\"hdfs\",\"ranger\",\"spark\",\"mapred\",\"tez\",\"zookeeper\",\"rangerlogger\",\"kafka\",\"yarn\",\"ams\",\"rangeradmin\"]", 
-        "mysql_jdbc_url": "http://c6407.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6407.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/secured.json b/ambari-server/src/test/python/stacks/2.2/configs/secured.json
index 9b17aa3..65a05ee 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/secured.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json b/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json
index 5769244..be9fbf1 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/spark-job-history-server.json
@@ -27,7 +27,7 @@
     "hostname": "c6408.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6408.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6408.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_67",
         "java_version": "8",
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json b/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json
index 475a6f9..77b1072 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/ats_1_5.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json
index ad21c9b..e0bfd02 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/default.hbasedecom.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/default.json b/ambari-server/src/test/python/stacks/2.3/configs/default.json
index a50708f..89ff85b 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/default.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
index 0da58ce..8e2b61a 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_default.json
@@ -42,13 +42,13 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6405.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6405.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.8.0_40", 
         "ambari_db_rca_url": "jdbc:postgresql://c6405.ambari.apache.org/ambarirca", 
         "jce_name": "jce_policy-8.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://c6405.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6405.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.3.0.0-1606\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.3\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.3.0.0-1606\",\"baseSaved\":true},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6 [...]
         "group_list": "[\"hadoop\",\"users\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -61,7 +61,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"zookeeper\",\"ambari-qa\",\"hdfs\",\"hbase\"]", 
-        "mysql_jdbc_url": "http://c6405.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6405.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
index fd482db..49ac8d8 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
@@ -47,13 +47,13 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6405.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://c6405.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.8.0_40", 
         "ambari_db_rca_url": "jdbc:postgresql://c6405.ambari.apache.org/ambarirca", 
         "jce_name": "jce_policy-8.zip", 
         "custom_command": "RESTART", 
-        "oracle_jdbc_url": "http://c6405.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6405.ambari.apache.org:8080/resources/ojdbc6.jar",
         "repo_info": "[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.3.0.0-1606\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.3\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.3.0.0-1606\",\"baseSaved\":true},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6 [...]
         "group_list": "[\"hadoop\",\"users\",\"knox\"]", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
@@ -66,7 +66,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "user_list": "[\"storm\",\"zookeeper\",\"ambari-qa\",\"hdfs\",\"hbase\",\"knox\"]", 
-        "mysql_jdbc_url": "http://c6405.ambari.apache.org:8080/resources//mysql-connector-java.jar", 
+        "mysql_jdbc_url": "http://c6405.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "clientsToUpdateConfigs": "[\"*\"]"
     }, 
     "commandType": "EXECUTION_COMMAND", 
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/secure.json b/ambari-server/src/test/python/stacks/2.3/configs/secure.json
index e2a3d1d..ee09b61 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/secure.json
@@ -3,7 +3,7 @@
   "clusterName": "c1",
   "hostname": "c6401.ambari.apache.org",
   "hostLevelParams": {
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json b/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json
index ce982a1..1666ca8 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/spark_default.json
@@ -4,7 +4,7 @@
     "hostname": "c6401.ambari.apache.org",
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json
index b69a311..26b34fd 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default.json
@@ -23,13 +23,13 @@
     "hostname": "c6401.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.8.0_40", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "jce_policy-8.zip", 
         "java_version": "8", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "stack_name": "HDP", 
         "stack_version": "2.3", 
         "host_sys_prepped": "false", 
@@ -39,7 +39,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json
index 8abff9f..e771a0a 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json
@@ -23,13 +23,13 @@
     "hostname": "c6401.ambari.apache.org", 
     "hostLevelParams": {
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.8.0_40", 
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
         "jce_name": "jce_policy-8.zip", 
         "java_version": "8", 
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "stack_name": "HDP", 
         "stack_version": "2.3", 
         "host_sys_prepped": "false", 
@@ -39,7 +39,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {}, 
diff --git a/ambari-server/src/test/python/stacks/2.4/configs/default.json b/ambari-server/src/test/python/stacks/2.4/configs/default.json
index 8822e96..e7bf889 100644
--- a/ambari-server/src/test/python/stacks/2.4/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.4/configs/default.json
@@ -6,7 +6,7 @@
         "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
index 560f3c1..319af66 100644
--- a/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
+++ b/ambari-server/src/test/python/stacks/2.5/HIVE/test_hive_server_int.py
@@ -720,7 +720,7 @@ class TestHiveServerInteractive(RMFTestCase):
                               sudo = True,
                               )
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'))
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'))
     self.assertResourceCalled('Execute', ('cp',
                                           '--remove-destination',
                                           '/tmp/mysql-connector-java.jar',
diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py
index a5b7383..2ba9831 100644
--- a/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py
+++ b/ambari-server/src/test/python/stacks/2.5/RANGER/test_ranger_admin.py
@@ -209,7 +209,7 @@ class TestRangerAdmin(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
       mode = 0644
     )
 
@@ -372,7 +372,7 @@ class TestRangerAdmin(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
       mode = 0644
     )
 
diff --git a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
index c971d44..f918693 100644
--- a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
+++ b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
@@ -218,7 +218,7 @@ class TestRangerKMS(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/tmp/jce_dir/UnlimitedJCEPolicyJDK7.zip',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip'),
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/UnlimitedJCEPolicyJDK7.zip'),
       mode = 0644,
     )
 
@@ -290,7 +290,7 @@ class TestRangerKMS(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
       mode = 0644
     )
 
@@ -665,7 +665,7 @@ class TestRangerKMS(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/tmp/jce_dir/UnlimitedJCEPolicyJDK7.zip',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip'),
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/UnlimitedJCEPolicyJDK7.zip'),
       mode = 0644,
     )
 
@@ -720,7 +720,7 @@ class TestRangerKMS(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
       mode = 0644
     )
 
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/default.json b/ambari-server/src/test/python/stacks/2.5/configs/default.json
index aa09ae2..e5393bd 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/default.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json b/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json
index 7622212..ebfc9a7 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/hsi_default.json
@@ -7,7 +7,7 @@
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
         "agentCacheDir": "/var/lib/ambari-agent/cache",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/hsi_default_for_restart.json b/ambari-server/src/test/python/stacks/2.5/configs/hsi_default_for_restart.json
index c2320ba..9b3e834 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/hsi_default_for_restart.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/hsi_default_for_restart.json
@@ -7,7 +7,7 @@
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
         "agentCacheDir": "/var/lib/ambari-agent/cache",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json b/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json
index 7b79d84..78a0063 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/hsi_ha.json
@@ -7,7 +7,7 @@
         "agent_stack_retry_count": "5",
         "agent_stack_retry_on_unavailability": "false",
         "agentCacheDir": "/var/lib/ambari-agent/cache",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "repo_info": "[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]",
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json
index 4e431bb..2a18a44 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json
@@ -167,14 +167,14 @@
         "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
         "host_sys_prepped": "false",
         "ambari_db_rca_username": "mapred",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "agent_stack_retry_count": "5",
         "stack_version": "2.5",
         "jdk_name": "jdk-8u60-linux-x64.tar.gz",
         "ambari_db_rca_driver": "org.postgresql.Driver",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "repository_version_id": "1",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "not_managed_hdfs_path_list": "[\"/tmp\"]",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "java_version": "8",
@@ -185,7 +185,7 @@
         "agentCacheDir": "/var/lib/ambari-agent/cache",
         "ambari_db_rca_password": "mapred",
         "jce_name": "jce_policy-8.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
         "clientsToUpdateConfigs": "[\"*\"]"
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json
index 288d155..8ea7906 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json
@@ -176,14 +176,14 @@
         "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
         "host_sys_prepped": "false",
         "ambari_db_rca_username": "mapred",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "agent_stack_retry_count": "5",
         "stack_version": "2.5",
         "jdk_name": "jdk-8u60-linux-x64.tar.gz",
         "ambari_db_rca_driver": "org.postgresql.Driver",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "repository_version_id": "1",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "not_managed_hdfs_path_list": "[\"/tmp\"]",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "java_version": "8",
@@ -194,7 +194,7 @@
         "agentCacheDir": "/var/lib/ambari-agent/cache",
         "ambari_db_rca_password": "mapred",
         "jce_name": "jce_policy-8.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
         "clientsToUpdateConfigs": "[\"*\"]"
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-default.json b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-default.json
index 7f060eb..37d84ba 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-default.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-default.json
@@ -193,14 +193,14 @@
         "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
         "host_sys_prepped": "false",
         "ambari_db_rca_username": "mapred",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "agent_stack_retry_count": "5",
         "stack_version": "2.5",
         "jdk_name": "jdk-8u60-linux-x64.tar.gz",
         "ambari_db_rca_driver": "org.postgresql.Driver",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "repository_version_id": "1",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "not_managed_hdfs_path_list": "[\"/tmp\"]",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "java_version": "8",
@@ -211,7 +211,7 @@
         "agentCacheDir": "/var/lib/ambari-agent/cache",
         "ambari_db_rca_password": "mapred",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
         "clientsToUpdateConfigs": "[\"*\"]"
diff --git a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
index f7f054a..4312700 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
@@ -203,14 +203,14 @@
         "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
         "host_sys_prepped": "false",
         "ambari_db_rca_username": "mapred",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "agent_stack_retry_count": "5",
         "stack_version": "2.5",
         "jdk_name": "jdk-8u60-linux-x64.tar.gz",
         "ambari_db_rca_driver": "org.postgresql.Driver",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "repository_version_id": "1",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "not_managed_hdfs_path_list": "[\"/tmp\"]",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "java_version": "8",
@@ -221,7 +221,7 @@
         "agentCacheDir": "/var/lib/ambari-agent/cache",
         "ambari_db_rca_password": "mapred",
         "jce_name": "UnlimitedJCEPolicyJDK7.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"kms\",\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
         "clientsToUpdateConfigs": "[\"*\"]"
diff --git a/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py b/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
index 2f77333..cbe689e 100644
--- a/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
+++ b/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
@@ -689,7 +689,7 @@ class TestDruid(RMFTestCase):
                               )
 
     self.assertResourceCalled('File', format("/tmp/mysql-connector-java.jar"),
-                              content= DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar')
+                              content= DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar')
                               )
     self.assertResourceCalled('Execute',
                               ('cp', '--remove-destination', '/tmp/mysql-connector-java.jar', format('/usr/hdp/current/{role}/extensions/mysql-metadata-storage/mysql-connector-java.jar')),
diff --git a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py
index e932648..4a38949 100644
--- a/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py
+++ b/ambari-server/src/test/python/stacks/2.6/RANGER/test_ranger_admin.py
@@ -193,7 +193,7 @@ class TestRangerAdmin(RMFTestCase):
                               )
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+                              content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
                               mode = 0644
                               )
 
@@ -252,7 +252,7 @@ class TestRangerAdmin(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
       mode = 0644
     )
 
@@ -437,7 +437,7 @@ class TestRangerAdmin(RMFTestCase):
     )
 
     self.assertResourceCalled('File', '/tmp/mysql-connector-java.jar',
-      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar'),
+      content = DownloadSource('http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar'),
       mode = 0644
     )
 
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/default.json b/ambari-server/src/test/python/stacks/2.6/configs/default.json
index 31f3dbd..35dd8f1 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/default.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json
index 3159058..9c8a563 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintext.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json
index 3941ff8..7826040 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_plaintextsasl.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json
index 675c0b9..a1dc30f 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_plaintext.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json
index ac263a4..457f334 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/default_kafka_sasl_ssl.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json
index e3044cb..1dc5344 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json
@@ -175,14 +175,14 @@
         "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
         "host_sys_prepped": "false",
         "ambari_db_rca_username": "mapred",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "agent_stack_retry_count": "5",
         "stack_version": "2.6",
         "jdk_name": "jdk-8u60-linux-x64.tar.gz",
         "ambari_db_rca_driver": "org.postgresql.Driver",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "repository_version_id": "1",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "not_managed_hdfs_path_list": "[\"/tmp\"]",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "java_version": "8",
@@ -193,7 +193,7 @@
         "agentCacheDir": "/var/lib/ambari-agent/cache",
         "ambari_db_rca_password": "mapred",
         "jce_name": "jce_policy-8.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
         "clientsToUpdateConfigs": "[\"*\"]"
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json
index 38b5906..531265f 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json
@@ -184,14 +184,14 @@
         "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
         "host_sys_prepped": "false",
         "ambari_db_rca_username": "mapred",
-        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar",
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/mysql-connector-java.jar",
         "agent_stack_retry_count": "5",
         "stack_version": "2.6",
         "jdk_name": "jdk-8u60-linux-x64.tar.gz",
         "ambari_db_rca_driver": "org.postgresql.Driver",
         "java_home": "/usr/jdk64/jdk1.7.0_45",
         "repository_version_id": "1",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "not_managed_hdfs_path_list": "[\"/tmp\"]",
         "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
         "java_version": "8",
@@ -202,7 +202,7 @@
         "agentCacheDir": "/var/lib/ambari-agent/cache",
         "ambari_db_rca_password": "mapred",
         "jce_name": "jce_policy-8.zip",
-        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources/ojdbc6.jar",
         "db_driver_filename": "mysql-connector-java.jar",
         "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
         "clientsToUpdateConfigs": "[\"*\"]"
diff --git a/ambari-server/src/test/python/stacks/2.6/configs/secure_kafka_sasl_ssl.json b/ambari-server/src/test/python/stacks/2.6/configs/secure_kafka_sasl_ssl.json
index 82b3f11..03f9dd1 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/secure_kafka_sasl_ssl.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/secure_kafka_sasl_ssl.json
@@ -6,7 +6,7 @@
     "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
     "agent_stack_retry_count": "5",
     "agent_stack_retry_on_unavailability": "false",
-    "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+    "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
     "ambari_db_rca_password": "mapred",
     "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
     "jce_name": "UnlimitedJCEPolicyJDK7.zip",
diff --git a/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py b/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py
index f9ad166..7636c2d 100644
--- a/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py
+++ b/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_common_services/HIVE/0.11.0.2.0.5.0/package/scripts/hive.py
@@ -49,7 +49,7 @@ def hive(name=None):
   )
 
   cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 "
-               "{jdk_location}{check_db_connection_jar_name} -o {check_db_connection_jar_name}'")
+               "{jdk_location}/{check_db_connection_jar_name} -o {check_db_connection_jar_name}'")
 
   Execute(cmd,
           not_if=format("[ -f {check_db_connection_jar_name}]"))
diff --git a/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py b/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py
index f9ad166..7636c2d 100644
--- a/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/test/resources/TestAmbaryServer.samples/dummy_stack/HIVE/package/scripts/hive.py
@@ -49,7 +49,7 @@ def hive(name=None):
   )
 
   cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 "
-               "{jdk_location}{check_db_connection_jar_name} -o {check_db_connection_jar_name}'")
+               "{jdk_location}/{check_db_connection_jar_name} -o {check_db_connection_jar_name}'")
 
   Execute(cmd,
           not_if=format("[ -f {check_db_connection_jar_name}]"))
diff --git a/ambari-server/src/test/resources/custom_actions/check_host_ip_addresses.json b/ambari-server/src/test/resources/custom_actions/check_host_ip_addresses.json
index 19e3e5b..bdb551d 100644
--- a/ambari-server/src/test/resources/custom_actions/check_host_ip_addresses.json
+++ b/ambari-server/src/test/resources/custom_actions/check_host_ip_addresses.json
@@ -4,19 +4,19 @@
     "hostname": "c6401.ambari.apache.org",
     "passiveInfo": [],
     "hostLevelParams": {
-        "jdk_location": "http://192.168.64.1:8080/resources/",
+        "jdk_location": "http://192.168.64.1:8080/resources",
         "ambari_db_rca_password": "mapred",
         "java_home": "/usr/jdk64/jdk1.6.0_31",
         "ambari_db_rca_url": "jdbc:postgresql://192.168.64.1/ambarirca",
         "stack_name": "HDP",
-        "oracle_jdbc_url": "http://192.168.64.1:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://192.168.64.1:8080/resources/ojdbc6.jar",
         "stack_version": "2.1",
         "db_name": "ambari",
         "ambari_db_rca_driver": "org.postgresql.Driver",
         "jdk_name": "jdk-6u31-linux-x64.bin",
         "ambari_db_rca_username": "mapred",
         "db_driver_filename": "mysql-connector-java.jar",
-        "mysql_jdbc_url": "http://192.168.64.1:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://192.168.64.1:8080/resources/mysql-connector-java.jar"
     },
     "commandType": "EXECUTION_COMMAND",
     "roleParams": {
diff --git a/ambari-server/src/test/resources/custom_actions/check_last_agent_env.json b/ambari-server/src/test/resources/custom_actions/check_last_agent_env.json
index 2b9db3e..3c14007 100644
--- a/ambari-server/src/test/resources/custom_actions/check_last_agent_env.json
+++ b/ambari-server/src/test/resources/custom_actions/check_last_agent_env.json
@@ -4,7 +4,7 @@
     "roleParams": {
         "threshold": "20",
         "check_execute_list": "last_agent_env_check",
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/"
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources"
     },
     "hostname": "c6402.ambari.apache.org",
     "passiveInfo": [],
@@ -18,7 +18,7 @@
     "public_hostname": "c6402.ambari.apache.org",
     "configurations": {},
     "commandParams": {
-        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources",
         "script": "check_host.py",
         "check_execute_list": "last_agent_env_check",
         "threshold": "20",
diff --git a/ambari-server/src/test/resources/custom_actions/invalid_check.json b/ambari-server/src/test/resources/custom_actions/invalid_check.json
index 8df58d3..f26c0da 100644
--- a/ambari-server/src/test/resources/custom_actions/invalid_check.json
+++ b/ambari-server/src/test/resources/custom_actions/invalid_check.json
@@ -4,19 +4,19 @@
     "hostname": "c6401.ambari.apache.org",
     "passiveInfo": [],
     "hostLevelParams": {
-        "jdk_location": "http://192.168.64.1:8080/resources/",
+        "jdk_location": "http://192.168.64.1:8080/resources",
         "ambari_db_rca_password": "mapred",
         "java_home": "/usr/jdk64/jdk1.6.0_31",
         "ambari_db_rca_url": "jdbc:postgresql://192.168.64.1/ambarirca",
         "stack_name": "HDP",
-        "oracle_jdbc_url": "http://192.168.64.1:8080/resources//ojdbc6.jar",
+        "oracle_jdbc_url": "http://192.168.64.1:8080/resources/ojdbc6.jar",
         "stack_version": "2.1",
         "db_name": "ambari",
         "ambari_db_rca_driver": "org.postgresql.Driver",
         "jdk_name": "jdk-6u31-linux-x64.bin",
         "ambari_db_rca_username": "mapred",
         "db_driver_filename": "mysql-connector-java.jar",
-        "mysql_jdbc_url": "http://192.168.64.1:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://192.168.64.1:8080/resources/mysql-connector-java.jar"
     },
     "serviceName": "null",
     "role": "check_host",
diff --git a/ambari-server/src/test/resources/custom_actions/ru_execute_tasks_namenode_prepare.json b/ambari-server/src/test/resources/custom_actions/ru_execute_tasks_namenode_prepare.json
index 60cab52..0edc01d 100644
--- a/ambari-server/src/test/resources/custom_actions/ru_execute_tasks_namenode_prepare.json
+++ b/ambari-server/src/test/resources/custom_actions/ru_execute_tasks_namenode_prepare.json
@@ -6,12 +6,12 @@
     "componentName": "", 
     "hostname": "u1202.ambari.apache.org", 
     "hostLevelParams": {
-        "jdk_location": "http://u1201.ambari.apache.org:8080/resources/", 
+        "jdk_location": "http://u1201.ambari.apache.org:8080/resources",
         "ambari_db_rca_password": "mapred", 
         "java_home": "/usr/jdk64/jdk1.7.0_67", 
         "ambari_db_rca_url": "jdbc:postgresql://u1201.ambari.apache.org/ambarirca", 
         "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
-        "oracle_jdbc_url": "http://u1201.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "oracle_jdbc_url": "http://u1201.ambari.apache.org:8080/resources/ojdbc6.jar",
         "stack_version": "2.2", 
         "stack_name": "HDP", 
         "db_name": "ambari", 
@@ -20,7 +20,7 @@
         "ambari_db_rca_username": "mapred", 
         "db_driver_filename": "mysql-connector-java.jar", 
         "agentCacheDir": "/var/lib/ambari-agent/cache", 
-        "mysql_jdbc_url": "http://u1201.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+        "mysql_jdbc_url": "http://u1201.ambari.apache.org:8080/resources/mysql-connector-java.jar"
     }, 
     "commandType": "EXECUTION_COMMAND", 
     "roleParams": {
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py
index f813755..3957ba9 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py
@@ -49,7 +49,7 @@ def hive(name=None):
   )
 
   cmd = format("/bin/sh -c 'cd /usr/lib/ambari-agent/ && curl -kf --retry 5 "
-               "{jdk_location}{check_db_connection_jar_name} -o {check_db_connection_jar_name}'")
+               "{jdk_location}/{check_db_connection_jar_name} -o {check_db_connection_jar_name}'")
 
   Execute(cmd,
           not_if=format("[ -f {check_db_connection_jar_name}]"))
diff --git a/ambari-web/app/assets/data/stack_versions/upgrade.json b/ambari-web/app/assets/data/stack_versions/upgrade.json
index a61e9ce..c3c401f 100644
--- a/ambari-web/app/assets/data/stack_versions/upgrade.json
+++ b/ambari-web/app/assets/data/stack_versions/upgrade.json
@@ -48,7 +48,7 @@
             "context" : "Restarting ZOOKEEPER_SERVER on ab2test-1.c.pramod-thangali.internal",
             "end_time" : 1421139703156,
             "group_id" : 1,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 100.0,
             "request_id" : 23,
@@ -81,7 +81,7 @@
             "context" : "Restarting ZOOKEEPER_SERVER on ab2test-3.c.pramod-thangali.internal",
             "end_time" : 1421139720823,
             "group_id" : 1,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 100.0,
             "request_id" : 23,
@@ -114,7 +114,7 @@
             "context" : "Restarting ZOOKEEPER_SERVER on ab2test-2.c.pramod-thangali.internal",
             "end_time" : 1421139730880,
             "group_id" : 1,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 100.0,
             "request_id" : 23,
@@ -147,7 +147,7 @@
             "context" : "Service Check ZOOKEEPER",
             "end_time" : 1421139751182,
             "group_id" : 1,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 100.0,
             "request_id" : 23,
@@ -193,7 +193,7 @@
             "context" : "Restarting JOURNALNODE on ab2test-1.c.pramod-thangali.internal",
             "end_time" : 1421139774445,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 100.0,
             "request_id" : 23,
@@ -226,7 +226,7 @@
             "context" : "Restarting JOURNALNODE on ab2test-3.c.pramod-thangali.internal",
             "end_time" : 1421139792374,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 100.0,
             "request_id" : 23,
@@ -259,7 +259,7 @@
             "context" : "Restarting JOURNALNODE on ab2test-2.c.pramod-thangali.internal",
             "end_time" : 1421139812096,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 100.0,
             "request_id" : 23,
@@ -292,7 +292,7 @@
             "context" : "Preparing NAMENODE on ab2test-2.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 70.0,
             "request_id" : 23,
@@ -325,7 +325,7 @@
             "context" : "Restarting NAMENODE on ab2test-2.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -358,7 +358,7 @@
             "context" : "Restarting NAMENODE on ab2test-1.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -391,7 +391,7 @@
             "context" : "Restarting HISTORYSERVER on ab2test-2.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -424,7 +424,7 @@
             "context" : "Restarting APP_TIMELINE_SERVER on ab2test-2.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -457,7 +457,7 @@
             "context" : "Restarting RESOURCEMANAGER on ab2test-2.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -490,7 +490,7 @@
             "context" : "Preparing HBASE_MASTER on ab2test-1.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -523,7 +523,7 @@
             "context" : "Restarting HBASE_MASTER on ab2test-1.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -556,7 +556,7 @@
             "context" : "Service Check HBASE, MAPREDUCE2, HDFS, YARN",
             "end_time" : 0,
             "group_id" : 2,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -637,7 +637,7 @@
             "context" : "Restarting  DATANODE on ab2test-3.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 3,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -670,7 +670,7 @@
             "context" : "Restarting  NODEMANAGER on ab2test-3.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 3,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -703,7 +703,7 @@
             "context" : "Restarting  HBASE_REGIONSERVER on ab2test-1.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 3,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -736,7 +736,7 @@
             "context" : "Service Check HBASE, HDFS, YARN",
             "end_time" : 0,
             "group_id" : 3,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -791,7 +791,7 @@
             "context" : "Verfication Required",
             "end_time" : 0,
             "group_id" : 3,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -837,7 +837,7 @@
             "context" : "Restarting HDFS_CLIENT on ab2test-1.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 4,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -870,7 +870,7 @@
             "context" : "Restarting HDFS_CLIENT on ab2test-3.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 4,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -903,7 +903,7 @@
             "context" : "Restarting HDFS_CLIENT on ab2test-2.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 4,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -936,7 +936,7 @@
             "context" : "Restarting YARN_CLIENT on ab2test-3.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 4,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -969,7 +969,7 @@
             "context" : "Restarting MAPREDUCE2_CLIENT on ab2test-3.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 4,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -1002,7 +1002,7 @@
             "context" : "Restarting HBASE_CLIENT on ab2test-3.c.pramod-thangali.internal",
             "end_time" : 0,
             "group_id" : 4,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -1035,7 +1035,7 @@
             "context" : "Service Check HBASE, MAPREDUCE2, HDFS, YARN",
             "end_time" : 0,
             "group_id" : 4,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -1114,7 +1114,7 @@
             "context" : "Confirm Finalize",
             "end_time" : 0,
             "group_id" : 5,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -1147,7 +1147,7 @@
             "context" : "Execute HDFS Finalize",
             "end_time" : 0,
             "group_id" : 5,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
@@ -1180,7 +1180,7 @@
             "context" : "Save Cluster State",
             "end_time" : 0,
             "group_id" : 5,
-            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
+            "host_params" : "{\"ambari_db_rca_driver\":\"org.postgresql.Driver\",\"ambari_db_rca_password\":\"mapred\",\"ambari_db_rca_url\":\"jdbc:postgresql://ab2test-1.c.pramod-thangali.internal/ambarirca\",\"ambari_db_rca_username\":\"mapred\",\"db_driver_filename\":\"mysql-connector-java.jar\",\"db_name\":\"ambari\",\"java_home\":\"/usr/jdk64/jdk1.7.0_67\",\"jce_name\":\"UnlimitedJCEPolicyJDK7.zip\",\"jdk_location\":\"http://ab2test-1.c.pramod-thangali.internal:8080/resources/\",\"j [...]
             "log_info" : null,
             "progress_percent" : 0.0,
             "request_id" : 23,
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json
index c07994b..947d996 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_3.json
@@ -63,7 +63,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -81,7 +81,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
@@ -333,7 +333,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json
index 4dc1a25..50e42ed 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_4.json
@@ -135,7 +135,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -189,7 +189,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -243,7 +243,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
diff --git a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json
index 94158ec..3773ed1 100644
--- a/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json
+++ b/ambari-web/app/assets/data/wizard/deploy/5_hosts/poll_5.json
@@ -135,7 +135,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -225,7 +225,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -333,7 +333,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
diff --git a/ambari-web/app/assets/data/wizard/deploy/master_failure/poll_3.json b/ambari-web/app/assets/data/wizard/deploy/master_failure/poll_3.json
index fdcc25c..d1564e4 100644
--- a/ambari-web/app/assets/data/wizard/deploy/master_failure/poll_3.json
+++ b/ambari-web/app/assets/data/wizard/deploy/master_failure/poll_3.json
@@ -63,7 +63,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -81,7 +81,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
@@ -333,7 +333,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
diff --git a/ambari-web/app/assets/data/wizard/deploy/master_failure/poll_4.json b/ambari-web/app/assets/data/wizard/deploy/master_failure/poll_4.json
index efb5631..2f84ccc 100644
--- a/ambari-web/app/assets/data/wizard/deploy/master_failure/poll_4.json
+++ b/ambari-web/app/assets/data/wizard/deploy/master_failure/poll_4.json
@@ -135,7 +135,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -189,7 +189,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -243,7 +243,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
diff --git a/ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_3.json b/ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_3.json
index e424cea..008dd70 100644
--- a/ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_3.json
+++ b/ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_3.json
@@ -63,7 +63,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -81,7 +81,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "FAILED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
@@ -333,7 +333,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "FAILED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
diff --git a/ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_4.json b/ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_4.json
index 97b0532..fce6774 100644
--- a/ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_4.json
+++ b/ambari-web/app/assets/data/wizard/deploy/slave_failure/poll_4.json
@@ -135,7 +135,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -189,7 +189,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "FAILED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -243,7 +243,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "FAILED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
diff --git a/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_3.json b/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_3.json
index aa68ebd..c2670de 100644
--- a/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_3.json
+++ b/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_3.json
@@ -63,7 +63,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -81,7 +81,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "FAILED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
@@ -333,7 +333,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
diff --git a/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_4.json b/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_4.json
index cc35177..213a64b 100644
--- a/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_4.json
+++ b/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_4.json
@@ -135,7 +135,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -189,7 +189,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -243,7 +243,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "FAILED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
diff --git a/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_5.json b/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_5.json
index bd923a1..47b8d9a 100644
--- a/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_5.json
+++ b/ambari-web/app/assets/data/wizard/deploy/slave_warning/poll_5.json
@@ -135,7 +135,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/12",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "FAILED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host4",
@@ -207,7 +207,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/15",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.14 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.10 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host2",
@@ -225,7 +225,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/1",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.18 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /Stage[1]/Hdp::Create_smoke_user/Hdp::User[ambari_qa]/User[ambari_qa]/ensure: created\u001B[0 [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host3",
@@ -333,7 +333,7 @@
       "href" : "http://ambari:8080/api/clusters/mycluster/requests/1/tasks/5",
       "Tasks" : {
         "exit_code" : 0,
-        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
+        "stdout" : "\u001B[0;36mnotice: /File[HDP]/ensure: defined content as '{md5}2290dede8198ef8f6d1f7333aaaf26b6'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;36mnotice: /File[HDP-epel]/ensure: defined content as '{md5}bcb85db5fb936fca2ced5e8e064ed563'\u001B[0m\n\u001B[0;36mnotice: Finished catalog run in 0.15 seconds\u001B[0m\n\n\u001B[0;33mwarning: Dynamic lookup of $service_state at /var/lib/ambari-agent/puppet/modules/hdp-hadoop/manifest [...]
         "status" : "COMPLETED",
         "stderr" : "none\nnone\nnone",
         "host_name" : "host1",
diff --git a/ambari-web/app/assets/data/wizard/kerberos/kerberize_cluster.json b/ambari-web/app/assets/data/wizard/kerberos/kerberize_cluster.json
index 60c9aef..4fa0a0f 100644
--- a/ambari-web/app/assets/data/wizard/kerberos/kerberize_cluster.json
+++ b/ambari-web/app/assets/data/wizard/kerberos/kerberize_cluster.json
@@ -53,7 +53,7 @@
             "start_time" : 1417823276167,
             "status" : "FAILED",
             "stderr" : "File \"/var/lib/ambari-agent/cache/stacks/HDP/2.2/services/KERBEROS/package/scripts/kerberos_client.py\", line 25\n    print \"Hello....\n                   ^\nSyntaxError: EOL while scanning string literal",
-            "stdout" : "2014-12-05 23:48:00,605 - Execute['mkdir -p /var/lib/ambari-agent/data/tmp/AMBARI-artifacts/;     curl -kf -x \"\" --retry 10     http://c6402.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip -o /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip'] {'environment': ..., 'not_if': 'test -e /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', 'ignore_failures': True, 'path': ['/bin', '/usr/bin/']}\n2014-12- [...]
+            "stdout" : "2014-12-05 23:48:00,605 - Execute['mkdir -p /var/lib/ambari-agent/data/tmp/AMBARI-artifacts/;     curl -kf -x \"\" --retry 10     http://c6402.ambari.apache.org:8080/resources/UnlimitedJCEPolicyJDK7.zip -o /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip'] {'environment': ..., 'not_if': 'test -e /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', 'ignore_failures': True, 'path': ['/bin', '/usr/bin/']}\n2014-12-0 [...]
             "structured_out" : { }
           }
         },
@@ -434,7 +434,7 @@
             "start_time" : 1417823276167,
             "status" : "FAILED",
             "stderr" : "File \"/var/lib/ambari-agent/cache/stacks/HDP/2.2/services/KERBEROS/package/scripts/kerberos_client.py\", line 25\n    print \"Hello....\n                   ^\nSyntaxError: EOL while scanning string literal",
-            "stdout" : "2014-12-05 23:48:00,605 - Execute['mkdir -p /var/lib/ambari-agent/data/tmp/AMBARI-artifacts/;     curl -kf -x \"\" --retry 10     http://c6402.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip -o /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip'] {'environment': ..., 'not_if': 'test -e /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', 'ignore_failures': True, 'path': ['/bin', '/usr/bin/']}\n2014-12- [...]
+            "stdout" : "2014-12-05 23:48:00,605 - Execute['mkdir -p /var/lib/ambari-agent/data/tmp/AMBARI-artifacts/;     curl -kf -x \"\" --retry 10     http://c6402.ambari.apache.org:8080/resources/UnlimitedJCEPolicyJDK7.zip -o /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip'] {'environment': ..., 'not_if': 'test -e /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', 'ignore_failures': True, 'path': ['/bin', '/usr/bin/']}\n2014-12-0 [...]
             "structured_out" : { }
           }
         },
@@ -815,7 +815,7 @@
             "start_time" : 1417823276167,
             "status" : "FAILED",
             "stderr" : "File \"/var/lib/ambari-agent/cache/stacks/HDP/2.2/services/KERBEROS/package/scripts/kerberos_client.py\", line 25\n    print \"Hello....\n                   ^\nSyntaxError: EOL while scanning string literal",
-            "stdout" : "2014-12-05 23:48:00,605 - Execute['mkdir -p /var/lib/ambari-agent/data/tmp/AMBARI-artifacts/;     curl -kf -x \"\" --retry 10     http://c6402.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip -o /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip'] {'environment': ..., 'not_if': 'test -e /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', 'ignore_failures': True, 'path': ['/bin', '/usr/bin/']}\n2014-12- [...]
+            "stdout" : "2014-12-05 23:48:00,605 - Execute['mkdir -p /var/lib/ambari-agent/data/tmp/AMBARI-artifacts/;     curl -kf -x \"\" --retry 10     http://c6402.ambari.apache.org:8080/resources/UnlimitedJCEPolicyJDK7.zip -o /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip'] {'environment': ..., 'not_if': 'test -e /var/lib/ambari-agent/data/tmp/AMBARI-artifacts//UnlimitedJCEPolicyJDK7.zip', 'ignore_failures': True, 'path': ['/bin', '/usr/bin/']}\n2014-12-0 [...]
             "structured_out" : { }
           }
         },
diff --git a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive.py b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive.py
index f3e7a0f..3ef6009 100755
--- a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive.py
+++ b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive.py
@@ -275,7 +275,7 @@ def hive(name=None):
       jdbc_connector(params.hive2_jdbc_target, params.hive2_previous_jdbc_jar)
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-       content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+       content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
        mode = 0644,
   )
 
diff --git a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive_interactive.py b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive_interactive.py
index 74c67fc..6009cb6 100755
--- a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive_interactive.py
+++ b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/HIVE/package/scripts/hive_interactive.py
@@ -257,7 +257,7 @@ def hive_interactive(name=None):
     jdbc_connector(params.target_hive_interactive, params.hive_intaractive_previous_jdbc_jar)
 
   File(format("/usr/lib/ambari-agent/{check_db_connection_jar_name}"),
-       content = DownloadSource(format("{jdk_location}{check_db_connection_jar_name}")),
+       content = DownloadSource(format("{jdk_location}/{check_db_connection_jar_name}")),
        mode = 0644)
   File(params.start_hiveserver2_interactive_path,
        mode=0755,

-- 
To stop receiving notification emails like this one, please contact
rlevas@apache.org.