TEIID-2391 fix for not propagating the nodeId