Fix docs so they will format correctly
Fix condition, avoid deprecation warning.

Find returns -1 if string not found which results in True.
Don't try to set cmd user if we're already the correct user
fix for #12641

dont set __salt__ to self, since lazyloader isn't necessarily execution modules
Adding ability to retrieve doc strings for returners and runners.
Add missing flag to jobs.lookup_jid
Merge pull request #13149 from garethgreenaway/develop

Additions to sysmod.py
Merge pull request #13140 from basepi/openstackdocs13133

Fix openstack docs so they will format correctly
Merge pull request #13145 from zeezooz/iptables_check

Fix condition, avoid deprecation warning.
Merge pull request #13147 from basepi/brewuser13097

Don't try to set brew cmd user if we're already the correct user
Merge pull request #13148 from jacksontj/develop

fix for #12641
Update 'doc/.tx/config' - Build #69

  http://cookingwithsalt.org/job/salt/job/transifex/69/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
introducing the foreman ext_pillar module
Fix merge_if_exists in states.file.serialize

This feature was recently added, but about two weeks before it was
added, this state started importing salt.utils.{yaml,json} as yaml/json.
This makes the yaml.load (or json.load) fail since these functions are
not in the serializer modules.

This fixes merge_if_exists by importing the serializer modules for yaml
and json under a different namespace, allowing the yaml and json modules
to also be loaded.

It also makes the change to using yaml.safe_load, and also adds a
versionadded directive for merge_if_exists.
Ensure correct syspath
Skip test if unable to import the git python package
Merge pull request #13153 from s0undt3ch/hotfix/transifex-updates

Update 'doc/.tx/config' - Build #69
Merge pull request #13159 from s0undt3ch/develop

Ensure correct syspath
Cleanup for #13160

This commit makes the changes from #13160 conform to the Salt way by
kreturning booleans for enable/disable. In addition, it makes the
following changes:

1. Adds versionadded directives

2. Fixes leaked file handles by using with statements (and
   salt.utils.fopen).

3. Raises a CommandExecutionError in ares where the failure of a
   function reaches an error case.
Implement puppet agent enable/disable'ing