Merge change 27146 into eclair

* changes:
  Reduce debugging spew and add props to selectivly re-enable it.