Merge branch 'next'
add hbase-0.98 support