Documented JSON outputter config options and fixed 'null' case
Continue if master in multi-master is down
Guh. Typoed earlier and forgot to remove.
Fix error message for missing include

This fixes an error where the wrong SLS target would be reported as
missing, when a missing include was encountered.

This is fixed upstream already, this commit just brings the relevant
part of the fix to the 2014.1 branch.
Merge pull request #15333 from basepi/bp-14904

Backport #14904 and #14929 to 2014.1
Merge pull request #15361 from terminalmage/fix-missing-include-2014.1

Fix error message for missing include
Fix ZMQ warning

The logic in this warning message was incorrect, as it would warn if
there is no zmq_version_info attribute in pyzmq, but then knowingly say
in the comment that pyzmq 2.1.9 doesn't have this attribute.

This uses zmq.zmq_version_info() if present, and if not then falls back
to obtaining the version string from zmq.version_info() and building a
version info tuple out of the result.
Fix ZMQ warning

The logic in this warning message was incorrect, as it would warn if
there is no zmq_version_info attribute in pyzmq, but then knowingly say
in the comment that pyzmq 2.1.9 doesn't have this attribute.

This uses zmq.zmq_version_info() if present, and if not then falls back
to obtaining the version string from zmq.version_info() and building a
version info tuple out of the result.
Merge pull request #15363 from terminalmage/fix-zmq-warning-2014.1

Fix ZMQ warning
Merge pull request #15316 from basepi/bp-15300

Backport #15300 to 2014.1
file.replace issue when show_changes is False. Fixes #14978
  - raise SaltClientError exception when a minion can't connect to
    any of the configured masters
Merge pull request #15378 from dsumsky/salt-minion-multi-master-bug-2

salt minion multi-master exception bug
Update to latest bootstrap script stable release v2014.08.30

* Skip service checks for `salt-api`, since this should be an opt-in service not necessarily meant to start at boot time.
* Distro Support Fixes:
  * Also install the salt-api service on RHEL based distributions for git based installations.
  * Properly detect Arch Linux when lsb-release is available
  * Updated the URL for EPEL 7
Merge pull request #15398 from s0undt3ch/hotfix/bootstrap-script-2014.1

Update to latest bootstrap script stable release v2014.08.30
Don't return multiple elements for grain 'osmajorrelease'.

Before this fix, the output of the 'osmajorrelease' grain looked like
this:

    osmajorrelease:
        7
        0.1406

Now it'll only return the actual major release number:

    osmajorrelease: 7
Merge pull request #15375 from boltronics/2014.1-issue_14978

file.replace issue when show_changes is False. Fixes #14978 (2014.1 branch)
We want to get ALL output from the VT process.
Merge pull request #15570 from s0undt3ch/2014.1

We want to get ALL output from the VT process.
Add `sftp_file` function and prefer it over `scp_file`