only use hbase-site.xml for impala config if hbase master/regionservers are present in a stack
merge upstream changes with hbase-site.xml/impala fix
fix a few impala configs leftover from the server/state-store split
Merge pull request #9 from cpenner461/master

impala configs