Add check for glob_match to make sure the tgt is a string
Add support for compound functions in client_acl_blacklist
Merge branch 'develop' of github.com:jacksontj/salt into develop
Merge pull request #6923 from jacksontj/develop

Fix for compound command and glob tgt not being a string
catch trace in ps module virtual function
Fix typo
Merge pull request #6926 from jacksontj/develop

Fix typo
Fix #6764
Extract minion_id and pass to top()

Contrary to previous information, the master_tops interface *expects*
the data to be limited to states applicable to a specific minion.
Therefore, the minion ID needs to be provided to reclass. As the
minion_id is currently not part of the master_tops interface, it needs
to be extracted from kwargs, see Salt issue #6930.

Signed-off-by: martin f. krafft <madduck@madduck.net>
doc fix in host state
when an ip has more than 1 aliases they will be written at the same line in the hosts file
Missing argument in _image_type()
Document the default NIC profile configuration
Fix missing import
One more missing import
Skip this test until properly mocked.
Merge pull request #6924 from s0undt3ch/hotfix/tests-temp-dirs

Fix missing import
Added ability to specify boot order
Correct RST monospace
Better error checking in `cmd.mod_watch` for `call`

`cmd.call` needs two parameters, `name` and `func`. mod_watch now checks for the second required parameter `func` also.