--- tomcat7     2015-06-16 16:03:17.331886781 +0200
+++ tomcat7.orig        2015-06-16 16:09:17.615131609 +0200
@@ -240,9 +240,6 @@
                        --retry=TERM/20/KILL/5 >/dev/null
                if [ $? -eq 1 ]; then
                        log_progress_msg "$DESC is not running but pid file exists, cleaning up"
-               elif [ $? -eq 2 ]; then
-                       log_progress_msg "Failed to stop $NAME (pid $PID) within retry schedule"
-                       exit 1
                elif [ $? -eq 3 ]; then
                        PID="`cat $CATALINA_PID`"
                        log_failure_msg "Failed to stop $NAME (pid $PID)"