Simplify. No functional change.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1609103 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56658
Avoid delay between registrations of mappings for context and for its servlets.

It is backport of r1606714.

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