We needed a bit more to work around os-client-config 1.18.0's broken precedence; this can't all be fixed in OSC. Change-Id: Ibe1c36e72c96eb2b3746645f7e6b433307ce8021