changed typod locator
added check for close button as per BZ 785203
fixed restartTomcat() for Fedora16+