AMBARI-3179. unit test failure in trunk - testPopulateResources_journalNode
AMBARI-3180. Helper script for HDP upgrade.