Refactoring to remove conflicting hbase site file references