Sync from oslo-incubator

This patch is intended to bring in `config.generator`. It also syncs
Marconi's modules to the latest oslo-incubator version for the sake of
being up-to-date.

Change-Id: I9cd3ccf0ce509349d561132025add42dec83ca0a
Merge "Sync from oslo-incubator"