Nasty loop for wheezy XenAPI location
useless else
Merge contextlib fix with Wheezy fix
Cleaner approach to find out XenAPI on Debian systems
Added fall back to "webrsync" in case of failure of "rsync" Portage synchronization. Added support for GPG signed Portage snapshot ("webrsync-gpg" feature).
"emerge-delta-webrsync" is also supported and preferred.
This code require #5198
Removed salt.modules.cmdmod import, use os.popen() instead as we don't have access to __salt__ here
Merge remote-tracking branch 'upstream/develop' into gentoo-webrsync

Conflicts:
	salt/modules/eix.py
Allow slashes in gitfs envs, Fix #5007
Add docstring to interface()
Merge pull request #5251 from UtahDave/new_win_network

Add docstring to interface()
be consistent about .override use

disabling of service is correct, but checking whether
it is disabled is not

upstart service is disabled by creating {service-name}.override file
and adding a 'manual' stanza there [1]

[1] http://upstart.ubuntu.com/cookbook/#disabling-a-job-from-automatically-starting
Add new ref logic to _get_ref as well
Merge pull request #5252 from kvbik/disabling-upstart-job

be consistent about .override use
Merge pull request #5253 from basepi/gitfs5007

Allow slashes in gitfs envs, Fix #5007
Parse kwargs with YAML, Fix #5224
Merge pull request #5256 from basepi/yamlargs5224

Parse kwargs with YAML, Fix #5224
Use yamlify_arg() in more places
Fix bug in minion_publish repair
Revert "add try/except when getting process owner"

This reverts commit 4e71d74ff13625c41d0e3b7ac9a9894aae1847e8.
Revert "Handle args that were previously parsed into lists, Fix #5031"

This reverts commit 773fda0fa1f9c6eb6d6f1e39945ea5ea67e0e52d.