Merge "Drop test_node_label" into feature/zuulv3