Merge branch 'jd-cuttlefish-path-relativity'
Merge branch 'master' of github.com:basho/riak_test
Add tests for counters in mixed clusters
Merge branch 'master' of github.com:basho/riak_test
Merge branch 'master' of github.com:basho/riak_test
Merge branch 'master' into feature/rdb/crdt-mixed-cluster
Check round trip and capability for counters / crdts
Stop PB clients after test
Merge pull request #418 from basho/feature/rdb/crdt-mixed-cluster

Add tests for CRDT capability