possible fix for https://github.com/saltstack/salt/issues/5567
possible fix for https://github.com/saltstack/salt/issues/5567
supporting tomcat6
less copy/paste
Fix tracebacks when prefix not specified.

This fixes #6886 by accounting for instances where the prefix is not
specified, catching the KeyError exceptions.
Merge pull request #6903 from UtahDave/develop

Add doc showing how to install a Salt Master
Merge branch 'develop' of git://github.com/foxx/salt into foxx-develop

Conflicts:
	salt/utils/timed_subprocess.py
fixed preun/postun scripts for salt-minion for the Red Hat .spec file
Take the id out of the auth sign in

This should fix #4617 but needs more testing
Added bookmark support to hgfs.

Added new option to hgfs ``hgfs_branch_method``. If set to ``branches``,
bookmarks will be ignored. If set to ``bookmarks`` branches will be
ignored. If set to ``mixed`` both will be used.
Merge pull request #6889 from laroche/develop

fixed preun/postun scripts for salt-minion for the Red Hat .spec file
Merge pull request #6907 from shadowfax-chc/hgfs-bookmarks

Added bookmark support to hgfs.
Added reference docs for hgfs.
Make the publisher high water mark configurable
Fix LOGS_DIR path - 'ROOT_DIR/var/log/salt', not 'ROOT_DIR/var/logs/salt'
Merge pull request #6910 from dlanderson/fix_syspath

Fix LOGS_DIR path - 'ROOT_DIR/var/log/salt', not 'ROOT_DIR/var/logs/salt...
Merge pull request #6909 from shadowfax-chc/hgfs-docs

Added reference docs for hgfs.
doh!
Use None, not empty dict in function definition
Fix fad method call and bad default arg