Add Yokozuna

Make the changes needed to bundle Yokozuna with the Riak release.
(cherry picked from commit 78b54c9bfcbc468ad5c001227b3eaa6d34ea3326)

Conflicts:
	rebar.config