Merge branch 'master' into feature/zuulv3

Null-merged https://review.openstack.org/#/c/254957/ as the thing it was
doing needs independent thought.

Change-Id: I1af5f2f3bcffa84058dba61d990e0e7c9b6a4b23