Merge pull request #1 from sfultongv/sfultong-14.04

updating tomcat to version 7
adding tomcat version 8
Merge pull request #3704 from sfultong/upstream-master

tomcat: update to upstream master