Merge from 4.2-dev changes for TRQ-2436: Segfault in add_node_names.