Deprecated some stuff in mocks to respect javax-servlet 3.1'