XD-342 Fix classpath error caused by multiple conflicting servlet-api jars