Tweaks to test DB upgrades
Mark work as done
Merge branch 'master' of https://github.com/mikalstill/openstack-ci-tools