Guice-util: pop scope from ComponentScope when leaving instead of setting to null.  Otherwise, injecting a component before a componentScoped dependency will clear the component scope from higher in the hierarchy