remove haddop-one version
Merge branch 'HBASE-6581' into HBASE-10336
Add tests