updated puppet.py with an example that has more than one argument, also added missing comma on line 663 that was causing cmd.py to fail
Merge pull request #7243 from s0undt3ch/hotfix/lint

Lint fixes
Merge pull request #7241 from gravyboat/develop

updates to puppet.py for additional examples, and a fixed comma in cmd.py
fixing modjk.recover_all function
(https://github.com/saltstack/salt/commit/08ddd2ae6dfb8fab2c03160a4c780ca70752f089#commitcomment-4093277)
Merge remote-tracking branch 'upstream/develop' into modjk

Conflicts:
	salt/modules/modjk.py
Merge pull request #7245 from ranl/modjk

fixing modjk.recover_all function
Add missing import.
Merge pull request #7246 from s0undt3ch/develop

Add missing import.
Merge remote-tracking branch 'upstream/develop' into develop
Allow user to use the '--global' flag for git config settings.

This resolves #7156
By default 'is_global' is set to False.
Side Effects: Each call to config_set includes the '--local' or '--global'
flags.
Audit module documentation (U to W)

This commit continues the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com.
Merge pull request #7251 from terminalmage/docs

Audit module documentation (U to W)
Merge pull request #7248 from jcockhren/add_global_flag_git_config

Add global flag git config
Modify sys.doc to replace rst directives

This commit modifies sys.doc so that the rst directives within it look
better on the CLI when the docs are printed to the terminal.
Add halite startup hooks into the master
Adding an option to queue state commands instead of failing immediately
Merge pull request #7252 from terminalmage/sysdoc-rst-replace

Modify sys.doc to replace rst directives
Use raw strings with backslashes.
Merge pull request #7256 from s0undt3ch/develop

Use raw strings with backslashes.
Audit module documentation (X to Z + new mac modules)

This commit completes the work started in 7d4739d, putting CLI examples
in bash code-blocks to give them syntax highlighting on
docs.saltstack.com. Combined with 5094719, this both improves the
documentation on the website, as well as the messages seen when using
sys.doc.