Made JDNC and JNDI settings optional (should not need jdbc configured to use JNDI and vice versa).  Updated Cargo it-tests to use newest Tomcat.  Removed nasty null pointer issue.