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'
Log warning if the grains file cannot be parsed. Refs #8690.
add function file.grep
Don't depend on the pecl return code because it's broken.

Refs #8750.
Pass unix_socket option through to the execution module.

Refs #8702.
update function: file.grep

Add exception handling for cmd.run_all
add ability for ip_addr to filter by cidr
fix docstring
return correct list
Fix uninitialized var error. Fixes #8667.
Fix incorrect multiple blockreplace block handling

This fixes #8710.
Expose a copy of the state dictionary to state functions.

Fixes #8343 since `__sls__` is now available in `__state__` and not on `kwargs`.
Closes #8709 since it's not the right approach.
Fixes #8710 and closes #8711 since I've cherry-picked the fix for #8710 in from #8711.
Apparently python 2.6 does not know that `{'a', 'b', 'c'}` is a `set()`.
Correct the state test case and respective expected output.