Sync w/ latest keystone conf changes.