Merge "Fix search disk name for the config_drive in scenario test"