Merge "Sync config file generator from oslo"