Merge "Update config generator from oslo-incubator"