Handle upgrades from Folsom
Merge branch 'master' of https://github.com/mikalstill/openstack-ci-tools