Merge change I73fd1714

* changes:
  Fix OSNetworkSystem.acceptImpl error handling; additional clean-up.