Fix regression in #6734

Group variables defined in inventory should override
entries in the group_vars directories.

Add regression test.