added javax-servlet-api dependency as provided
Merge branch 'dev' into servlet2
javax-servlet api not needed for this branch