DB-2175: revert old patch and added new one
Merge branch 'HDP-2.1.5.0' of https://github.com/splicemachine/hortonworks-hbase-release into HDP-2.1.5.0