Use utils.combine_vars on vars_files data

Fixes #7345