Small code cleanup: HoyaAppMaster#createAndRunCluster() calls getLocalConfDir() early
log4j for HBase uses DailyRollingFileAppender
BUG-9882 initial implementation treats hoya-client.xml as a default resource -but this exposes a requirement for it to be loaded after the yarn-default.xml site -ugly
BUG-9882 client resource is loaded independently and merged in
Merge branch 'feature/BUG-9882-hoya-client.xml' into develop
Merge branch 'develop' of github.com:hortonworks/hoya into develop

# By tedyu
# Via tedyu
* 'develop' of github.com:hortonworks/hoya:
  log4j for HBase uses DailyRollingFileAppender
  Small code cleanup: HoyaAppMaster#createAndRunCluster() calls getLocalConfDir() early
Merge remote-tracking branch 'hortonworks/feature/BUG-9882-hoya-client.xml' into feature/BUG-9254-secure

* hortonworks/feature/BUG-9882-hoya-client.xml:
  BUG-9882 client resource is loaded independently and merged in
  BUG-9882 initial implementation treats hoya-client.xml as a default resource -but this exposes a requirement for it to be loaded after the yarn-default.xml site -ugly

Conflicts:
	hoya-core/src/main/java/org/apache/hadoop/hoya/HoyaKeys.java
	hoya-core/src/main/java/org/apache/hadoop/hoya/tools/HoyaUtils.java
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