When reporting invalid cluster node names, keep configuration order

While here, fix an unused variable warning.
Merge bug26257 (again)
Merge heads of default