Resolve riak-control version conditionals.

Simply the logic and make it a bit more resilient to failures when doing
a rolling upgrade.
Merge pull request #652 from basho/features/csm/riak-control

Resolve riak-control version conditionals.