first draft
Merge remote-tracking branch 'upstream/develop' into ebuild_enhanced

Conflicts:
	salt/states/portage_config.py
some fixes
merge fix
other merge fix
added check_extra_requirements function
check_extra_requirements documentation
some fixes
fixes
doc fix
overlay->repository
Fix use of msg before assignment
Correct behaviour of when using list with cross-env file path
Merge pull request #5830 from terminalmage/docs

Further clarification on add-apt-repository
Add ip6 grain
Merge pull request #5831 from jcassee/develop

Add ip6 grain
Add fqdn_ip4 and fqdn_ip6 grains
Salt's git state and git module now honors the identity file for
`git submodule`
Merge pull request #5834 from czee/develop

Salt's git state and git module now honors the identity file for `git submodule`
pillar: docs for include