Merge "Use the old interface when resetting connections" into jb-mr2-dev