renamed context to servlet-context to be inline with Selmer, updated to latest Selmer