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

tomcat module addition