fixing duplicate output of modjk
changing has_key function
Syntax of versionadded
distutil.version is not in distutil all
check for multiple strings in the test
remove commented out code
use the comparability of LooseVersion to do version checking
Merge pull request #7002 from riverajo/postgres-distutil

Postgres distutil
Merge pull request #6995 from ranl/modjk

fixing duplicate output of modjk
Merge pull request #7004 from UtahDave/update_tests

Update tests
Merge pull request #6998 from holmboe/patch-1

Syntax of versionadded
Updated Salt version requirements for Formulas
Changed package-map.jinja references to map.jinja
Fix #6963

we don;t need to bother with yaml if the type is not string,
because the type is already defined.
Remove extra white-space.
docstring formatting in ps module
move seed functions into seed module from img
Remove miss-leading exception.
add lxc module
Merge pull request #7005 from s0undt3ch/develop

Remove extra white-space.