Fixing __import__ method behavior to respect importlib method behavior
Added --pillar-root option

Complement to --file-root option added in
abc240f7ba006f35d7f5463db54ba2aefcdde106
Added warning about * default to cron docs
Replaced Python 2.7-ism when importing Django model
quick fix to the iptables docs to show that set_policy is for the default rule on a chain
updated FAQ.
updated to faq file to reword backwards compatibility
When reading the map file, use Mako-specific classes only if they are
imported.
Merge pull request #8507 from georgegoh/develop

When reading the map file, use Mako-specific classes only if they are imported
don't fail for no files found Fixes #8517
Merge pull request #8518 from graingert/patch-1

don't fail for no files found Fixes #8517
Fix for issue #8519

Also added a test that fails prior to the fix, illustrating the problem.
updated rackspace docs
Merge pull request #8522 from ahale/develop

updated rackspace docs
Merge pull request #8523 from whiteinge/django-importlib-fix

Replaced Python 2.7-ism when importing Django model
Minor fix in ports state __virtual__ function

The if statement should have been checking to see if 'ports.install' is
in the __salt__ dict. As it was before this commit, the second half of
the if statement would always resolve to True.
Updated bad link to Windows downloads in the salt-cloud docs
Merge pull request #8525 from terminalmage/quickfix

Minor fix in ports state __virtual__ function
removing unneeded imports from gnomedesktop module.
Merge remote-tracking branch 'upstream/develop' into develop