Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54955
Merged revision 1484592 from tomcat/trunk:
During reloading the application, the context root Wrapper is not removed correctly. This causes 404 to be returned later on when the context root is requested.

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