Combine similar tests into same file. No functional change.
ContextRoot and WelcomeFile mapper tests are moved into TestMapperWebapps class.
It is backport of r1610188.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1610198 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56658#c3
Fix regression that context reloads were broken.
It is backport of r1610186.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1610199 13f79535-47bb-0310-9956-ffa450edef68
Fix an error with removal of the last context version in removeContextVersion(), add test.
The issue was reported for Tomcat 7 in "Time for 7.0.55" thread on dev mailing list.
It is backport of r1610197.

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