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
Don't make pkg/service states available unless provider module is loaded

This prevents ugly tracebacks when an OS does is not properly detected,
and no pkg or service provider was loaded for the minion. pkg and
service states will still fail, but they'll fail more gracefully,
without the traceback.
Add note on pkg/service states not working to FAQ

Also fixed a typo in an RST directive.
Merge pull request #7406 from terminalmage/docs

Add note on pkg/service states not working to FAQ
Add suspend, resume, lock to openstack nova
Merge pull request #7407 from techhat/novafix

Add suspend, resume, lock to openstack nova