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
Update windows.rst

I think 2008 SP1 is needed. In my case it was crashing with return code 0
some fixes
Let's make it reusable having the std{err,out} logging handler names configurable.
Allow the logger names to also be configurable as keyword arguments.
fixes
Include salt-testing as a develop requirement.
Merge pull request #5802 from alexanderhaensch/patch-1

Update windows.rst
doc fix
Merge pull request #5803 from s0undt3ch/develop

Configurable nb_popen std{err,out} logging handler names (Reusability)
Restructure for topics/conventions/ docs

Add index.rst for conventions
Add the Salt Release Process to the documentation
Add conventions to the TOC
Merge pull request #5808 from basepi/releasedocs

Add the Salt Release Process to the documentation