Add support for Riak CS Control.
Merge branch 'master' into riak-cs-control

Conflicts:
	metadata.rb