Merge change 5863

* changes:
  Obex library cleanup, first pass.