Config changes to support trial deployment
Make testing more robust against slow start/stop of embedded tomcat
(needed for running tests as maven when seems to slow it all down)