Sync w/ latest downstream oslo-config updates.