Updated build scripts to handle new branchs and to blow away working dir...

...ectory before restarting tomcat