Merge "Don't request empty nodesets" into feature/zuulv3