Update oslo-incubator for new config generator

Updates to Ic845ca2399052809ae814e6543733ace735f1bd9
Note: this only updates the config generator as there
are significant changes to the db code.

Change-Id: Idbd51d6e5a7563889f2b09f22088f8d5f230de74
Fix the authtoken config sample

Change-Id: I90e0bfd149ef63d9d6579e027741b4f7b133eb00
Merge "Update oslo-incubator for new config generator"
Merge "Fix the authtoken config sample"