Replace timeout with wait for riak_kv service
Merge pull request #148 from basho/eas-remove-verify-basic-upgrade-timeout

verify_basic_upgrade failures