fixes #1033 and #1032 for a tomcat distro for fabric8