renamed postgres.db to postgres.maintenance_db and all postgres module function arguments from db to maintenance_db
made default maintenance_db "postgres" and also made default postgres/psql runas local-server only
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
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
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