Merge changes Iaa8658bd,Ifdae88ec into stable-2.4

* changes:
  Fix deadlock on destroy of CommandFactoryProvider.
  Use AtomicBoolean for "logged" in CommandFactoryProvider.