[DEV-3594] Added configurator back and changed ContextHandlerCollection to the generic HandlerCollection