Fix publish tests
Add id from originating minion if sent to the publish
Allow the event listener to work with the test sockets. And even for the minion's
`runas` needs root permissions.
Merge pull request #4628 from s0undt3ch/develop

Require root perms
We're no longer leaking threads. Travis-CI should be OK with 10 worker threads.
tomcat module addition
- tomcat wait function
- tomcat mod_watch funtion
- a bit of docs fix
Merge pull request #4631 from ranl/develop

tomcat module addition
Merge pull request #4632 from s0undt3ch/hotfix/fix-travis-again

We're no longer leaking threads. Travis-CI should be OK with 10 worker threads
Merge pull request #4232 from tohojo/ipv6-support

IPv6 support for master-minion communication
Since turning on ipv6 can break ipv4 in some networks only enable

ipv6 if explicity devind in the config. Also since pyzmq will still
have the flag and then fail silently if the underlying zmq does not support
ipv6
Add extra include docs, fix #4274
Fix #4102

The scheduler was not explicitly calling the returner function
Propagate ipv6 option to dns lookup function.
Merge pull request #4638 from s0undt3ch/merges/tohojo

Propagate ipv6 option to dns lookup function.
Warn and reset `worker_threads` to the minimum of 3 if lower.
Double to single quotes.
Make `salt.payload.SREQ` IPv6 aware.

Since `salt.payload.SREQ` also checks for the `IPV4ONLY` attribute, which was added because of the IPv6 support, and that has proven problematic in some networks, we only set `IPV4ONLY` if IPv6 support is enabled.
second bugfix for #1598

ssh.rm_known_host does not reset the ownership of .ssh/known_hosts to the
specified user.
Merge pull request #4641 from fsaintjacques/develop

second bugfix for #1598