Cleaning up tomcat restart, and getting the non-ssh clone happening in
the CF script