Update config generator

Updated straight from oslo-incubator.

Change-Id: I3ff25a7e70e03c0651b6dfa23a526771c6496cfb
Merge "Update config generator"