[BZ 1120696] EWS RPM installed Tomcat version is not discovered.

Conflicts:
	modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java