am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev

* commit '36a151abcd794524358a74599a1f4ab130ca7b55':
  Use the old interface when resetting connections
tree: 35e63eb4562d505b5bfcea6eb91a1d9ab6d61f74
  1. core/
  2. services/