Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51526 Merged revision 1517941 from tomcat/trunk: o.a.catalina.startup.Tomcat.addWebapp(...) will process web application's context.xml when it is presented in the provided baseDir.
tomcat/tc7.0.x/trunk/
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/Tomcat.java