Merge "Recycle stale SQL connections" into feature/zuulv3