Attempt to fix upgrade issues
Merge branch 'master' of github.com:willkelly/openstack-ha