FLUME-2397: HBase-98 compatibility

(Hari Shreedharan via Jarek Jarcec Cecho)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk