JBIDE-18787 - Build failures with Mars M3 TP

Enforcing the use of javax.servlet 3.1