Merge change 20378

* changes:
  Suspend daemon threads before exiting.