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
Fix various "DeprecationWarning, module not renaming, just have __virtual__ return True" messages
FN_CACHE was not efficient as it was used to replace another dict.

And was defeating ``reload_modules: true`` in states.
states.file.replace(append/prepend_if_not_found)
don't exit in an unknown state
return only once

for consistency with the build() function.
was producing redundant information in output
mkpart should only create partitions and mkpartfs should support xfs
rename variable to ease code reading
_ret_status expect only keywords argument
comply with returned state interface

http://docs.saltstack.com/ref/states/writing.html#return-data
Improving salt-cloud ec2 describe_snapshots function
Don't grab opts/pillar values when there is an explicit default file

Simple fix for bug #11133. If a defaults file is *explicitly* passed in at the same time that a mysql.user (etc) exists in opts/pillar, then the opts/pillar user will override the default file instead of the other way around. This change would fix this, but could in theory break things for older version. The ideal solution would be to actually parse the defaults file, but that seems way more error prone.
Don't shadow "destroy" method.

Fixes #11135.
Pass through no_start to lxc.{bootstrap,run_cmd}
Update install docs for salt-cloud to reflect merging into Salt proper.
Merge pull request #11175 from terminalmage/issue11135

Don't shadow "destroy" method.