Cleaning up integration tests and ensuring they work with Riak 2
Merge branch 'lrb-misc-fixes' of github.com:basho-labs/CorrugatedIron into lrb-misc-fixes