Drop duplicated versions in salt.modules.pkg_resource.sort_pkglist()
Add clarification for pull #12678
Change user salt configs to .saltrc from .salt to prevent conflicts
Fix timedatectl parsing for newer systemd releases

systemd 210 changed the output for timedatectl, changing 'Timezone' to
'Time zone'. This commit fixes a traceback that occurs in
timezone.get_zone for these newer versions of systemd.

Additionally, for get_zone() and get_hwclock(), parsing of timedatectl
has been changed from an ugly and unwieldy shell one-liner to actual
python logic.

Finally, output_loglevel has been set to 'debug' for all shell commands
in this module, part of a greater effort to make the logs less noisy.
Fix missing import
Merge pull request #12729 from terminalmage/fix-timedatectl-2014.1

Fix timedatectl parsing for newer systemd releases (2014.1 branch)
Improve jinja error reporting

Salt execution functions routinely raise SaltInvocationError and
CommandExecutionError exceptions. This commit catches them in the jinja
renderer and provides a nicely-formatted error message, preventing the
traceback from being in the render error that is printed to the CLI.
Raise exceptions when trying to read nonexistant files

Prevents a traceback when an invalid timezone is passed
Catch exceptions raised when comparing timezone
Fix lint failure
Merge pull request #12725 from terminalmage/issue12696-2014.1

Jinja renderer, timezone module/state fixes (2014.1 branch)
Added warnings for mdadm API change.

See comments from @thatch45 on #12680
Merge pull request #12758 from tedski/mdadm_warn

Added warnings for mdadm API change.
Fix #10140 Fix #12705

Conflicts:
	salt/client/ssh/__init__.py
Cherry fixes for zmq issue on debian tracker
Pass the args to the function
Add some error checking to our job cache cleanup
Merge pull request #12828 from basepi/orchfix12451

Actually pass the args in salt.function state
Merge pull request #12831 from basepi/jobcache12396

Add error checking to job cache cleanup
Allow for lists of iptables matches