hbase 0.94.15 + devel 0.96.1.1

Fixes #25601