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
The result of `ssh_known_hosts` changed in 8f728fb, so should the test case.
Only load the `monit` module if the required `monit` binary is found. Fixes #5871.

Double to single quotes.
Typo.
Merge pull request #5875 from s0undt3ch/issues/5871-check-for-monit-binary

Only load the `monit` module if the required `monit` binary is found.
Merge pull request #5874 from s0undt3ch/hotfix/fix-travis-again

The result of `ssh_known_hosts` changed in 8f728fb, so should the test case
Update `salt.config` to use `salt.utils.fopen` instead of `open`
Update `salt.crypt` to use `salt.utils.fopen` instead of `open`
Update `salt.fileserver.gitfs` to use `salt.utils.fopen` instead of `open`
Update `salt.grains.extra` to use `salt.utils.fopen` instead of `open`