Merge remote-tracking branch 'origin/slf-vnode-ops-opts' into HEAD

Conflicts:
	src/riak_kv_vnode.erl