Added another test to module.run state unit tests
Merge remote-tracking branch 'upstream/develop' into sam_dev1
Fixed pylint warnings
Merge pull request #16887 from SmithSamuelM/sam_dev1

Added partial support for Multi-Master in Raet
Fix for #16888
We can't set the default value to something if you want the config to be relative to cachedir.

Since there is already code in apply_minion_config to take care of this we remove this, meaning now that if you set cachedir it won't break these
Avoid key error in connected_ids()

Continue through the loop if we could't access the grains instead of
crashing and burning.

Closes #15143
only add mine.update to schedular if function is available
Merge pull request #16881 from jacksontj/2014.7

Fixes for Syndic
Merge pull request #16884 from terminalmage/issue16874

Install repoquery if not present on yum-based distro
Merge pull request #16812 from syphernl/fix/tomcat_tabstrip

Strip off tabs for tomcat version calls
Merge pull request #16877 from jasonrm/fix/digitalocean-list-images

Fix salt-cloud list-images for DigitalOcean images
Change profile name for Digital Ocean cloud tests

Digital Ocean changed their image-naming scheme. This should fix the failing tests.
Merge pull request #16841 from isbm/salt-zypper

Package lock management support for Zypper
Fixed lint comment
Release notes for 2014.1.13
Point to the correct latest 2014.1.13 release

This is recurring and #12720 is tracking the issue.

Conflicts:
	doc/topics/releases/index.rst
Update conf.py as well
Fixed invalid archive type error message, was reporting 'name' not 'archive_format'
Merge pull request #16886 from techhat/filemap

Add file_map to salt.utils.cloud.bootstrap-enabled providers
Catch error conditions in quota.get_mode

Closes #16381