Merge upstream changes

Merge upstream changes from openstack-infra/jeepyb