Upgrade checks

Check on these things:

Tomcat:

1. Whether a resource defined for mail/Session is required anywhere in code. Answer: Yes