Port Jeremy's servlet init code to jetty9 service
Fix whitespace issues
Merge pull request #2 from cprice404/maint/master/port-jeremys-servlet-init

Port Jeremy's servlet init code to jetty9 service