(*) CTL-557 ServiceLocator should support IDisposable