Issue #2939526 by davewilly, heddn, Frank Ralf: Unused migrate_plus.migration.wine_variety_list.yml.txt example + test fixes