Better Riak and Redis cleanup in tests.
Clean up creation of VumiApi instances in tests a bit.
Merge branch 'feature/issue-690-better-test-cleanup' into develop