Differentiate between tomcat directory and deployment directory.
Move references to sql scripts into the WEB-INF directory.
Merge 1.9 changes into Head