Riak tests passed.
Merge remote-tracking branch 'origin/rbdevel' into kl-dev
[merge] Merging with rbdevel riak support