Merge "Verify nodes and requests are not leaked" into feature/zuulv3