Merge pull request #3 from cprice404/maint/master/port-jeremys-servlet-init-code

Port up Jeremy's code for initializing servlet parameters