Update servlet test dependencies

Partial resolution of: https://www.pivotaltracker.com/story/show/78390060