AMBARI-3377. Set the value of hbase.hstore.flush.retries.number to 120. (mahadev)
AMBARI-3378. hive-site.xml has some deprecated configs which has no effect. (mahadev)