Tomcat upgrade

This change updates the Tomcat version to 8.0.0-rc5.
Merge branch 'tomcat-upgrade'