verify_basic_upgrade failures

Hopefully it just requires adding some proper wait functions. Here is the log in giddyup for the failures in Fedora 17:
http://basho-giddyup.herokuapp.com/#/logs/2065

On FreeBSD, we see potentially a different issue. The failure seems to happen while waiting for the service to come up:
http://basho-giddyup.herokuapp.com/#/logs/2030