Resolve riak_control failures.

Resolve failures with cuttlefish configuration changes in Riak 2.0.

Remove riak_control_upgrade, since riak_control should cover those use
cases completely.
Merge pull request #597 from basho/bugfix/csm/riak_control

Resolve riak_control failures.