Sync up with infra changes

Infra made some changes to zuul:
https://github.com/openstack-infra/config/commit/8347b74ace1758952d61da9a7d6b3f91ce8edddb

and jenkins job builder:
https://github.com/openstack-infra/config/commit/def93bc08620c44d1424b9276c51d2bcdd87242c