Clean up some leftover Riak objects in tests. (@Hodgestar)
Merge branch 'develop' into develop-frontend