Use new riak_kv branch

From now on use the yz-merge branch.  All changes to riak_kv can live
on their own branches and periodically the yz-merge branch can be made
by starting from master and merging all feature branches into it.