run.sh does not remove the pid file

Using the latest run.sh, the pid file is not deleted after the process is stopped. Could additional checks be made to ensure the file is removed.
For instance, the last three lines could be added to ensure the files are removed.

if [ "$JBOSS_STATUS" -ne 10 ]; then

1. Wait for a complete shudown
wait $JBOSS_PID 2>/dev/null
fi
if [ "x$JBOSS_PIDFILE" != "x" ]; then
grep "$JBOSS_PID" $JBOSS_PIDFILE && rm $JBOSS_PIDFILE
fi

This is linked to the fix in https://jira.jboss.org/browse/JBPAPP-3797
It was fixed in https://issues.jboss.org/browse/JBPAPP-4494 but not committed to the EAP 5.x branch