Integration/riak admin handoff team

WIP: Do not merge