Changed servlet-api deps to servlet-dependencies. Fixed a few compile
errors mostly related to ApplicationFactory calls.