RF-12998: Marked the servlet APIs as <provided>, fixed the ResourceServlet package in the web.xml and tidied up the xml root of the tomcat web.xml