SOS-1417
SOS-1417 Change to be "bundled-tomcat" instead of "tomcat-ee-6.1.20"
SOS-1417 Change to be "bundled.tomcat.dir.name" instead of "tomcat.folder.dir"