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
Add fqdn_ip4 and fqdn_ip6 grains
pillar: docs for include
pillar: docs for include (tweak)
qemu_nbd: use cfdisk if available, per recommendation in fdisk man;
make compatible with Ubuntu
Fix fqdn_ip4 and fqdn_ip6 to list all addresses
Update fqdn_ip4 / fqdn_ip6 docstrings
Merge pull request #5835 from mgwilliams/pillar-include-defaults

docs for pillar include