BZ 690957  EWS Tomcat installed from RPM shutdown fails.

Conflicts:

	modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java