Merge change 5894

* changes:
  Obex library cleanup, second pass.