Coerce output of file.get_mode to string
Fix #4286 by returning an empty string from get_mode
Fix pip requirements caching issue
Merge pull request #4299 from jsdalton/fix_type_error_in_check_perms

Coerce output of file.get_mode to string
Merge pull request #4300 from maspwr/develop

Fix pip requirements caching issue
Add monitor list to disk state
make manpages on package build
Adding a reference to watch_in on the highstate reference
Merge pull request #4304 from JustinCarmony/docs-watch-in-plug

Adding a reference to watch_in on the highstate reference
Merge pull request #4303 from seanchannel/develop

make manpages on package build
removed runas for local network access
- using pillar instead of config.option
- using version option in tomcat manager instead of ##
- remove war file from minion after copying
use postgresql CSV export to read data from the db. also adds psql_query command.
Add option function to  utils
use salt.util.option instead of pillar/config.option
Fix blatant bug in salt.utils.option
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #4305 from ranl/develop

tomcat module fix
HACKING: add backslash to indicate line continuation and make it copy/pasteable