am d607b9c7: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'd607b9c725d8a080842e5969b2d6001249ad88cd':
  Use the old interface when resetting connections
  Fix account filtering for specific package name