Merge "BUG-2381: do not retain references to DependencyResolverManager"