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.
Add check for glob_match to make sure the tgt is a string
Store salt related path configurations in the `distribution` object. Fixes #6906.

Added `srv_root_dir` to the paths to check.
Update reclass_adapter documentation

Signed-off-by: martin f. krafft <madduck@madduck.net>
fixing url6 init
Make sure every temp dir created on the unittests respects, `integration.SYS_TMP_DIR`
Merge pull request #6888 from terminalmage/issue6886

Fix tracebacks when prefix not specified.
Merge pull request #6915 from s0undt3ch/features/improve-packaging

Store salt related path configurations in the `distribution` object
Merge pull request #6918 from madduck/reclass-docs-update

Update reclass_adapter documentation
Merge pull request #6919 from s0undt3ch/hotfix/tests-temp-dirs

Make sure every temp dir created on the unittests respects, `integration.SYS_TMP_DIR`
Merge pull request #6921 from ranl/tomcat6_support

Tomcat6 support
fix location of master pki_dir
Add support for compound functions in client_acl_blacklist
Merge branch 'develop' of github.com:jacksontj/salt into develop
Merge pull request #6923 from jacksontj/develop

Fix for compound command and glob tgt not being a string
catch trace in ps module virtual function
Fix typo
Merge pull request #6926 from jacksontj/develop

Fix typo