Upgrade deadlock fix

Fixed a brutal issue in okaara that was causing the upgrade to deadlock. This PR contains the new okaara version (I even remembered to update the spec) and some slight changes to the main upgrade script to take advantage of a new API change.

Another important note in this request is that okaara is now a server dependency since the pulp-v1-upgrade script uses it for its output. So far we've been lucky that QE has had the admin client installed.