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
Ass salt-ssh into setup.py
Fix syntax error caused by unicode character

in 20302cd, a unicode ellipsis character was introduced in a docstring,
causing a SyntaxError traceback. This commit fixes that.
Merge pull request #5856 from terminalmage/quickfix

Fix syntax error caused by unicode character
import salt.ssh
get opts for tgt and tgt_type from opts
Read in the arg_str and tgt for salt-ssh
use the existing selected target option
Removed links to Dash docs until feeds are fixed

See issue #5839 for infos.
fix pylint W1401 warnings in docstring