Fixed guest service deploy for tomcat; Fixed defining guests