added logic to umount a mounted filesystem when the mountpoint matches but the device does not (6079)
removed unintended tab characters
Merge pull request #6394 from UtahDave/develop

user proper spaces around '='
Also test for `retcode > 0`.
Mocked test for `salt.modules.archive.gzip()`
Mocked test for `salt.modules.archive.gunzip()`
Merge pull request #6395 from s0undt3ch/sprint/mock-salt.modules.alternatives

Also test for `retcode > 0`.
tomcat.passwd function, convert clear-text password to tomcat-users.xml file
docstring fix
Properly parse a PSQL server version, even beta versions. Fixes #6352.
Merge pull request #6396 from ranl/develop

tomcat.passwd function
Formatting fixes.

* Double to single quotes.
* Wrap CLI examples.
* Removed unneeded commas from `.format()` call arguments.
* Replaced string substitutions(ie, `%s`) with string formatting(`.format()`)
Typo.
Merge pull request #6398 from s0undt3ch/issues/6352-parser-psql-beta-version

Properly parse a PSQL server version, even beta versions
Wrap windows related imports in a try/except to properly handle module loading.
Code formatting, logic simplification, fewer local variable.
Merge pull request #6399 from s0undt3ch/hotfix/win-useradd-imports

Wrap windows related imports in a try/except to properly handle module loading
Salt needs to have it's module functions with a proper signature.
Simplify our decorator code and make it reusable.
The wrapped function now uses the same name as the original.