Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55743
Enable the stop script to work when the shutdown port is disabled and a PID file is defined.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1557751 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55986
When forcing Tomcat to stop via "kill -9 $CATALINA_PID", the <code>catalina.sh</code> script could incorrectly report that Tomcat had not yet completely stopped when it had.
Based on a patch by jess. 

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1557753 13f79535-47bb-0310-9956-ffa450edef68