CLEANUP: removing unneeded servlet-api from codebase
Merge pull request #800 from rackerlabs/CLEANUP_OLD_CODE

CLEANUP: removing unneeded servlet-api from codebase