Merge feature/pevm-metadata-cache into feature/pevm-metadata-cache.merged

Conflicts:
	src/riak_kv_vnode.erl