Merge remote-tracking branch 'upstream/master' into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #2985 from akoumjian/develop

Add bootstrap and prioritize platform instructions to install
SysBench module for testing salt minions

SysBench is a benchmark tool for measuring the system parameters. This module helps in analyzing the minions right from the master. This helps in scenarios like load balancing
Merge pull request #2988 from sharan-monikantan/develop

SysBench module for testing salt minions
Update Gentoo installation manual
Merge pull request #2989 from tchap/doc/emerge_salt

Update Gentoo installation manual
Make sure the Portage package name is unambiguous
Merge pull request #2990 from tchap/doc/emerge_salt

Make sure the Portage package name is unambiguous
More clarification/correction to hacking docs

Running pip install -e /path/to/git/clone from within the virtualenv
does not also install salt's additional required modules, as the
document suggests. I ran into this issue last week and so did a guy I
was helping troubleshoot in #salt.

Also, I clarified the bit about using --system-site-packages in your
virtualenv.
Make pidfile respect root_dir setting
Adding use_list to msgpack, this is due to msgpack depricating the default use_list