Let's try if mocking fixes the intermittent failures of the unit test.
Merge pull request #7506 from s0undt3ch/develop

Let's try if mocking fixes the intermittent failures of the unit test.
Update list of pkg providers in docs
Re-add setting the location of QEMU/KVM images
Merge pull request #7507 from holmboe/img_dir-issue-7491

Re-add setting the location of QEMU/KVM images
Updated the salt-ssh.rst to add the new options that are available via the command line. Modified the ssh index.rst to include a link to the salt-ssh cli commands page. Updated parsers.py to fix the default value that is present in the documentation from 5 to 25 (as 25 is the actual default). Updated roster.rst to note that the default file location is /etc/salt/roster since it was absent, and might be confusing if you head to the roster documentation before reading the rest of the salt-ssh documentation.
Merge pull request #7508 from gravyboat/develop

Updates to multiple salt-ssh/roster docs.
fixed both errors after sphinx build
Merge pull request #7511 from aboe76/fix_docs

fixed both errors after sphinx build
Specify reason for Python 2.7 requirement

While ElementTree is in Python 2.6, we need the expanded support
for xpath which was introduced in Python 2.7.

As discussed in #7264, it might be possible to install
`elementtree-1.3a3-20070912` for Python 2.6, but this is yet untested.
Merge pull request #7513 from holmboe/skipif-version_info

Specify reason for Python 2.7 requirement
Add --ssh-priv option to SaltSSHOptionParser
Fix grammar in Watch In state documentation
Merge pull request #7520 from graingert/patch-1

Fix grammar in Watch In state documentation
Merge pull request #7514 from paluh/develop

Add --ssh-priv option to SaltSSHOptionParser
Shorten --ssh-priv option to --priv
Merge pull request #7521 from paluh/develop

Shorten --ssh-priv option to --priv
Fixes typo
Merge pull request #7523 from ifnull/develop

Fixes typo
Allow region_name to be passed through to nova module