Log warning if the grains file cannot be parsed. Refs #8690.
Pass unix_socket option through to the execution module.

Refs #8702.
add ability for ip_addr to filter by cidr
fix docstring
return correct list
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.
require and prereq mixed tests, mostly failing, see #8785
Comments on require test example
Add another working prereq simple test
Missing states for the mixed require and prereq mixed tests
Remove wrong comments on prereq working test
Merge remote-tracking branch 'upstream/develop' into requisites-tests
Fixing _available_services in launchctl module
Added comment explaining the fix.
fixed uncaught exception in _available_services in launchctl module. Now follows symlinks
BUGFIX: Argument order `pw usermod` command.

The argument order of `pw usermod` is[1]:

    pw [-V etcdir] usermod [name|uid]

This was incorrect for the `chhome` function. The updated version is
tested on FreeBSD.

[1]: http://www.freebsd.org/cgi/man.cgi?query=pw&sektion=8
Add test for #8796: use does not inherit require. False test actually