#1127 Removed TESTCONTEXTTYPE's behavior of collecting web.xml listed Contexts and updated BaseTest to include them explicitly to fit the new Integration Test design.