Merge "Cancel/return nodepool requests on job cancel" into feature/zuulv3