Removed references to internal region terminology
Reuse Channels

with support for multiple ttypes

Submitting merge request to get jenkins run. Last time this was merged there were some problems which seem to be related to this but i'm unable to reproduce them locally-- so hopefully we can get something from Jenkins :)
Merge branch 'develop' of github.com:CaptTofu/salt into develop

Conflicts:
	doc/topics/cloud/hpcloud.rst
Merge branch 'develop' of https://github.com/saltstack/salt into develop
mkpart should only create partitions and mkpartfs should support xfs
Merge branch 'develop' of https://github.com/saltstack/salt into develop
HP Cloud is now using Havana
Fix regression in chocolatey.bootstrap
Merge pull request #11187 from terminalmage/issue10541

Fix regression in chocolatey.bootstrap
Revert "Revert "Fix #11003 TypeError: can only concatenate list (not "ImmutableLazyProxy(list)") to list""

This reverts commit 58ac70b85fa40c8d869dbba0a83c946af032442c.
Merge pull request #11191 from s0undt3ch/develop

Revert "Revert "Fix #11003 TypeError: can only concatenate list (not "Im...
Merge pull request #10332 from jacksontj/channelreuse

Reuse Channels
Register workers with the router
Add salt specific udp stack behavior
Set everythign to use msgpack
msgpack for events
Add a safe
kill spurious print
Merge remote-tracking branch 'upstream/develop' into develop
get is a function!