Only ignore build in top level
Add some stuff to make building rpms easier

Conflicts:
	pkg/rpm/salt.spec
Make buildid a argument
Inverted rules are now recognized for the -A, -s, and -d parameters.
Merge pull request #8547 from ConceitedCode/master

Some inverted rules are now recognized in the iptables module
Merge branch 'develop'
Merge branch 'develop'
add function file.grep
update function: file.grep

Add exception handling for cmd.run_all
wrap file copy in umasks to secure permissions

* salt.util.copyfile needs preceding with 54 (aka 0066) umask in order
  for new files to correctly get 0600 mode permissions.
* shutil.copyfile is preceded by a 63 (aka 0077) umask.

Fixes issue #8590
Merge remote-tracking branch 'upstream/master' into develop
Allow Facter to load Puppet-specific facts
add index to curly braces for .format()
Merge pull request #8870 from UtahDave/develop

add index to curly braces for .format()
Making the warning about the status of this driver more obvious
Merge pull request #8871 from techhat/novafix

Making the warning about the status of this driver more obvious
Fix ubuntu deps for pkgrepo integration tests

This fixes a typo'ed package name, as well as doing logic to determine
the correct package name based on the osrelease.
Allow Facter to load Puppet-specific facts
Merge branch 'develop' of github.com:maxchk/salt into develop
Merge branch 'facter-load-puppet-libraries' of github.com:maxchk/salt into facter-load-puppet-libraries