Merge pull request #5 from petersomogyi/HBASE-21431

HBASE-21431 Fix build and test issues