Roll riak 2.0.2
Merge branch '2.0' of github.com:basho/riak into 2.0