Merge pull request #8274 from slav0nic/patch-1

fix grammar in salt.renderers.jinja.rst
Merge pull request #8269 from vhgroup/develop

Minor fix and documentation
Merge pull request #8260 from terminalmage/issue8247

Add note to pkgrepo states when run with test=True
Added explanation and example of updating formula map via Pillar

Refs #8239
salt-ssh opts

This is a two-line change that merges the user-defined options into SSH wrappers. It addresses concerns raised by users that that salt-ssh does not respect settings like file-roots when they are defined in a configuration file. Refs #8005 and #8271.
Fixes #8216. Make sure that if the remote salt-ssh user is root, then files untarred by the shim are owned by root.
Use the JSON output from AWS. Need to test #6444
Merge pull request #8283 from cro/fix_8216

Fixes #8216. Make sure that if the remote salt-ssh user is root, then files untarred by the shim are owned by root.
Fix improper usage of Salt exception classes

Also fixed some string formatting and use of quoted string instead of
raw strings.
grains has_value()

Provide the user the ability in a template to easily see whether or not a particular grain has a value.  Refs #7829.
Create, list, delete and check for the existence of queues #6444
Pylint fixes.
Merge pull request #8285 from cachedout/#7829

Add a hasvalue function to grains module
Add refresh=False to remaining user.getent

This was present for some, but not all implementations of user.getent.
Honor test=True with friendlier return message in file.mknod state
Merge pull request #8286 from holmboe/getent-refresh

Add refresh=False to remaining user.getent
Covering case where kwarg cannot be un-yaml'd

In the past the master has been taking the kwargs passed in and converting them to a string (kwy=value) and letting the minion de-yaml that arg string. In general this is okay, but it doesn't work well if you are calling from the python LocalClient interface-- since the kwarg you passed already had a type. With this change instead of converting the kwarg to a string it is converted to a dict with a flag to mark it as a kwarg dict, then it is unpacked on the minion side while still maintining type
Fix argument parsing for invalid kwargs

Salt's argument parser checks the argspec in order to properly allow
positional arguments to be specified in key=value pairs when functions
are run on the command line. However, if a key=value pair is detected,
and the following case happens:

    A) **kwargs is not supported by the function
    B) The parsed argument name is not in the list of the function's
       positional arguments

Then the key=value pair ends up being passed as a positional argument,
leading to unexpected/unintended behavior.

This commit fixes this behavior by accumulating a list of these invalid
keyword arguments, and raising a SaltInvocationError exception if any
are found.
Merge pull request #8290 from terminalmage/issue8279

Fix argument parsing for invalid kwargs
Consolidate kw_ to only create one arg for all the kwargs (save space on the wire)