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
git state to update repo where rev = branch name
Merge pull request #7415 from terminalmage/docs

Fix typo
Adding file:// URL support for salt mako template lookup

Adding file:// URL support to lookup mako templates on local file
system...
If mako templates are already present on a local file system on a
minion, it can use file:// URL to lookup a local copy. This in addition
to salt:// url support that is already present, which fetches a copy
from a salt server.
Adding master side acl support for mine.get
Fixed error in ext_pillar() params

The minion_id param was not necessisary and was causing errors.
I also updated the docs to properly evaluate the yaml, and added
additional exception handling.