Fixed variable name typo and fixed AND logic after checkpidfile in stop
function.  This will allow the stop function to successfully complete when
the CATALINA_PID file is empty, which is it's default behavior.