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

Refs #8702.
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
Add test for #8796: use does not inherit require. False test actually
prereq tests for issue #8235 (yaml without lists) and error message difference in no-list mode
require vs require_in in not-list yamlsyntax: differences, still on #8235
commented tests for issue 8802 use recursion undetected
Add more unix_socket support, this time to user_chpass.
Typo fix.
Merge pull request #8798 from regilero/requisites-tests

Requisites tests
Merge pull request #8808 from cachedout/#8702

Passing unix_socket into MySQL exec module.