Fix problem with newer Tomcat cookbook
Add merged cookbooks
Remove Java cookbook version constraint
Fix attributes for default Tomcat version
Revert to old method of restarting Tomcat
More attribute simplification