Fix issue #363

Fix Apache Tomcat version detection
Merge pull request #538 from gadcam/upstream

Fix issue #363