Merge "BUG-1558 Fix BindingAwareActivator ignoring removedService call."