Unregister the servlets properly when the component is deactivated
Updated snapshot