AMBARI-8566. Remaining changes to Hadoop Sink implementation. HBASE template fix. (swagle)