Merge multi-hbase-profiles branch back into master

Hi Gabriel,

please consider this final merge of the multi-hbase-profiles back into master.
The idea here is that we don't want to keep them separate since any kind
of new development that you guys do on master should be applicable to
both HBase 0.94 and HBase 0.95+.

At this point all of the tests pass in both profiles.

Thanks,
Roman.