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