Merge pull request #4305 from ranl/develop

tomcat module fix
HACKING: add backslash to indicate line continuation and make it copy/pasteable
BUG FIX: use '/' as the path separator to match salt master.

On windows os.path.sep won't match the path separator used in lists of
paths returned by the master.

Minor optimization: calculate the probe string once ahead of the loop,
not each time around.
small optimization: Don't build string then immediately split to the same point.
Fix ref before assign errors in solr module
Fix bad ref to exc in ssh module
Kill a stray tab
Pass in carbon_sock to repair assignment error
Fix exception in fileclient

The data was refed before assignment, no need to delete this anyway
the named file would not exist in this case
Immport salt.master to get master exit exception
Small PEP8 fix
Catch pipe errors
Fix pkgrepo example
Remove usage of now nonexistent args in brew module
Defaults to keeping old configuration, avoids hanging
Fix some PEP8 formatting issues
Merge pull request #4310 from AccelerationNet/develop

Use posixpath sep everywhere
Merge pull request #4312 from basepi/pipe4296

Fix #4296 Catch errors from broken pipes
Merge pull request #4313 from dlindquist/master

Fix missing id declaration is documentation
Merge pull request #4314 from jasonrm/fix-brew-list

Remove usage of now nonexistent args in brew module