gitignore kate files
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
tomcat module digest auth
Merge remote-tracking branch 'upstream/develop' into develop
Under SmartOS the `osrelease` grain is `None`, handle that case.

* Double to single quotes.
Fix SmartOS grains.
Add error handling to Windows package management; use installer if uninstaller is missing
Merge pull request #5403 from s0undt3ch/hotfix/smartos-grains

Fix SmartOS grains.
Replace tabs with spaces
Show why the check is being made as it is.
Merge pull request #5404 from s0undt3ch/hotfix/handle-None-osrelease

Under SmartOS the `osrelease` grain is `None`, handle that case.
Merge pull request #5405 from djs52/develop

Add error handling to Windows package management
modules/smartos_vmadm: add destroy(uuid) function

This one will be required if you want to permanently remove a VM.
Merge pull request #5413 from virtua-network/smartos_vmadm

modules/smartos_vmadm: add destroy(uuid) function
Merge pull request #5398 from ranl/develop

tomcat module digest auth
fix doc that was missing a :
Merge pull request #5414 from UtahDave/develop

fix doc that was missing a :
Add success flag to LocalClient.get_full_return()
correct the line reference [#5408][https://github.com/saltstack/salt/issues/5408]