Fix Gradle server build and tomcat cmd line build