Fixed merge error in BaseServletTest.java.