Removed references to internal region terminology
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
Merge branch 'develop' of https://github.com/saltstack/salt into develop
HP Cloud is now using Havana
get is a function!
Correctly re-routepublish results from the local cmds
track on estate name, not estate object
Revert "Reuse Channels"

This reverts commit ae9b62c27f0c15e270391f776301280e46b03462.
Extend verify_env to cover raet key dirs if raet is enabled
Use the salt specific udp behavior
Make the salt-key cli system modular for raet keys
Fix #11173 1st chnage :passed saltenv as kwargs in kg state. 2nd chnage: added apt.Cache() in aptpkg module
Yet another fix for ImmutableProxyList

This is related to #11088, #11035, #11003, #11190.
Fix template packaging issue
Check /proc/vz/veinfo presence to distinguish between a real openvz virtual environment and a cloudlinux kernel
ini_manage module: Preserve empty lines between options and comments.
Cosmetic: Fix missing newline at the end of file.
Merge pull request #11168 from dmyerscough/develop

mkpart should only create partitions and mkpartfs should support xfs
Make fs_type not required