Convert to more modern openstack-common.conf format.

Change-Id: Ib02edb34b02d63f2dcf6fa08a224e5ec1fa02525
Merge "Convert to more modern openstack-common.conf format."