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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1518097 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51526
Added missing test resources.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1518101 13f79535-47bb-0310-9956-ffa450edef68