JCR-2052: Upgrade the servlet api to 3.0