Merge change Id8df149c into eclair

* changes:
  Turn some logging back on in ConnectionManager