Fix regression in #6734

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

Add regression test.
Merge branch 'tag-all' into boxever
Merge branch 'fix-6734' into boxever

Conflicts:
	test/integration/Makefile