Merge pull request #6659 from terminalmage/travis

Add space after comma to please Travis
Revert nonblocking commands

In an attempt to determine why all tests are failing when they pass
running the commands in the shell and used to pass
Reduce test suite worker threads to 3, the peer system does not

need extra procs anymore
Revert "Revert nonblocking commands"

This reverts commit 5176b51b4159b63c245918050f4984314d991010.
Add cli example to pkgng restore
Don't import deepcopy directly
Add CLI Examples to geenrated zfs docs
Add freebsd to grp covered platforms
Don't fail on valid order change
sleep longer for grains test if first return is bad
We should NEVER stack trace like this in a state!!
Again, don't stack trace States!!!
Again, don't do this!
Pass in extra args as a kw
freebsd uses wheel as well
Reject jid event data without an id
Flag to clean environment variables

https://github.com/saltstack/salt/issues/6642
check for validity of raw beyond type
adding modjk modules
Merge pull request #6662 from DDarko/develop

Flag to clean environment variables