Started some integration tests for mac_user module
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
Use --plugins to include plugin-provided repos

This adds --plugins to several repoquery calls, allowing results from
plugin-provided repositories to be returned.
file.blockreplace: fix typo endswith
Wrote a mac_user integration test
Merge pull request #11146 from ze42/dev_blockreplace

file.blockreplace: fix typo endswith
Fixing ini_manage module to preserve empty options. Added unit test for module to verify there are no regressions.
Merge pull request #11145 from terminalmage/issue11050

Use --plugins to include plugin-provided repos
Expose the worker tracker correctly from the datashare
Fixing formatting in ini_manage_test.py.
check to see if a partition exists
PEP8
pylint fixes
remove local cmd, the router sends them to the workers
Merge pull request #11152 from dmyerscough/develop

check to see if existing partitions exist
enter the setup frame before moving to the master udp frame
Get workers to start