Import oslo fix for generate config

Change-Id: I0692568780778d9063da6da824dee575ebaab4aa