Clean up some leftover Riak objects in tests. (@Hodgestar)
Merge branch 'develop' into feature/issue-581-conv-and-router-batches-at-creation