Update config generator from oslo-incubator

This commit pulls in the latests version of the config generator from
oslo.

Change-Id: I3a2b06dd9ca3285a3d93298ea5727b705f6109e4
Merge "Update config generator from oslo-incubator"