Merge "Add zuul->np test for invalid node type" into feature/zuulv3