Riak2

This will sync recent master changes with riak2 branch