Merge "Add friendly error messages and tests for nodeset dupes" into feature/zuulv3