Fix so that when built for the first time tomcat service should be started correctly.
Remove unused server.xml.SAMPLE as that configuration is not required.