Merge remote-tracking branch 'hortonworks/develop' into feature/BUG-9254-secure

# By tedyu
# Via Steve Loughran (2) and tedyu (1)
* hortonworks/develop:
  log4j for HBase uses DailyRollingFileAppender
  Small code cleanup: HoyaAppMaster#createAndRunCluster() calls getLocalConfDir() early

Conflicts:
	hoya-core/src/main/java/org/apache/hadoop/hoya/yarn/appmaster/HoyaAppMaster.java
move two config utilty methods from HoyaUtils to ConfigHelper -methods added in BUG-9882
Merge branch 'develop' into feature/BUG-9254-secure

* develop:
  move two config utilty methods from HoyaUtils to ConfigHelper -methods added in BUG-9882

Conflicts:
	hoya-core/src/main/java/org/apache/hadoop/hoya/tools/HoyaUtils.java