Folsom is started as part of riak_core
Merge branch 'test' into dev