Fixing __import__ method behavior to respect importlib method behavior
Only ignore build in top level
Add some stuff to make building rpms easier

Conflicts:
	pkg/rpm/salt.spec
Make buildid a argument
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.
cleanup of gnomedesktop support.  fixed pylint issues.  moved to using the salt cmd module instead of attempting to use python functions.  removed all eval calls in favor of using locals().
updated to faq file to reword backwards compatibility
When reading the map file, use Mako-specific classes only if they are
imported.
Update transifex configuration file with current sources.
A little bit more information.
moving pwd import into the try...except to avoid importerrors on windows.
Merge pull request #8506 from garethgreenaway/develop

cleanup of gnomedesktop support.  fixed pylint issues.  moved to using t...
psutil isn't in the stdlib
Merge pull request #8508 from UtahDave/develop

psutil isn't in the stdlib
no salt cloud on Windows
Merge pull request #8509 from UtahDave/kill_saltcloud

no salt cloud on Windows