Merge change I61c08260 into eclair

* changes:
  Futher reduce the logging of EriManager.