Use extra vars when creating HostVars

Fixes #9667