Merge OpenStack Zuul version: 2.0.0.200.g2c9effb

Merge configuration changes from OpenStack Zuul
version: 2.0.0.200.g2c9effb.

Change-Id: I24423ebe0a6f699032e04a0ea328c1b5ad9cd97b
Merge "Merge OpenStack Zuul version: 2.0.0.200.g2c9effb"