Merge "Fix wrong config_drive_cdrom option placement in nova config file"