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
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
Merge remote-tracking branch 'upstream/develop' into develop
Just add xfs supported filesystem
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
Merge pull request #11200 from techhat/parted

Make fs_type not required in partition.mkpart
Merge pull request #11193 from avdhoot/develop

Fix #11173 1st chnage :passed saltenv as kwargs in kg state. 2nd chnage:...
Merge pull request #11194 from makinacorpus/hotfix2

Yet another fix for ImmutableProxyList
Merge pull request #11180 from CaptTofu/develop

HP Is using Havana (vs. Grizzly)