am bf12d55b: resolved conflicts for merge of b69dd181 to mnc-dr-dev

* commit 'bf12d55ba61c54d45fc8e3924fa0cf13a0e592d9':
  Add missing unregistrations when a connection ends.