Merge remote-tracking branch 'upstream/develop' into tomcat6_support
Merge remote-tracking branch 'upstream/develop' into tomcat6_support
support windows local war files
using cp.get_url instead of up.get_file
docfix in tomcat state
Enable to virt.init on an ESX host

WARNING: This is currently untested on a KVM/QEMU host, so this might
very well introduce a regression. Please review.
Make the profiles fall back to defaults based on active hypervisor
Make virt.init return backwards compatible

Though I think virt.init should return True or False.
Keep it DRY
Rewrite freebsdpkg module
Rewrite pkgng module
Update pkg state to work with freebsd jails
Make docstring point to internal docs for remove func
Add new mac user/group modules to toctree
Mask module aliases for freebsdpkg, pkgng modules
Fix `pep8` `W291` and `E231` issues.

* W291: Trailing white space
* E231: Missing white-space after comma.
Minor formatting changes. Double to single quotes.
Merge pull request #7431 from s0undt3ch/hotfix/lint

Fix `pep8` `W291` and `E231` issues.
Move jinja template files into salt/templates

See #7291. This is the first step.
Properly identify Raspbian