Patch
Patch to correct cinder.conf file (no spaces around = in ini file)
Cinder DB connection
Merge remote branch 'upstream/master'