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
Use yamlify_arg() in more places
Got rid of os.popen() by calling a helper function from __virtual__
modules/virt.py: use qemu-img to detect image type; allow emulator type (e.g., kvm, qemu) to be passed as an arg to init
Updated salt-git package with new features
feautures:
- during installation a salt system user is created
- Creation of '/etc/salt/master.d/' for enhanced configuration
- salt-master run under own user 'salt'
- salt-user.conf created to set salt-master up for using salt system
  user
- added logrotate config files in appropriate place
- added bash-completion config files in appropriate place.
- Check if salt-master/salt-minion is running when upgrading
  and reexec / reload daemons accordingly
- Updated removal of salt package to remove 'cache' and 'log' dirs.
  and removal of salt system user.
- Made installation more verbose to communicate what happens.
Starting CouchDB returner.
Some documentation.
Working on some guts. Also renamed.
Some more debug, also importing json.
Working couchdb system.
Little more modular. Paving the way for options.
Some more comments.
Better wording.
Removing the create_db field. Also fixed typo.