Clean up AuraServlet.

@bug W-2082588@

@rev dchasman@
Merging origin/goliver/master-pending-servlet-cleanup into master