Updates for working with riak_test

This helps support [GiddyUp](//github.com/basho/giddyup) integration and fixes a few other things. 

This PR requires the changes from basho/riak_test#335.