Clean up some leftover Riak objects in tests. (@Hodgestar)
Merge branch 'develop' into develop-frontend
Clean up some leftover Riak objects in tests. (@Hodgestar)
Merge branch 'develop-frontend' into feature/issue-580-two-modals-appears-when-trying-to-export-contacts