Move the references to javax.servlet into the anonymous class
Merge pull request #857 from HiJon89/master

Move the references to javax.servlet classes into the anonymous class
Merge remote-tracking branch 'upstream/master'