changing grain structure to support the grains.present format
find leaks function
Merge pull request #4360 from ranl/develop

tomcat module addition
Merge pull request #4359 from s0undt3ch/develop

Include traceback in some debug logging. Use `exc_info`.
Fix some logging calls which included `exc_info` on the wrong function.