included the nodetype in the congruence check.
also handled the condition where the node id is null.

Change-Id: I536312801719f7596381db3294c091560d3b5e49
Signed-off-by: Asad Ahmed <asaahmed@cisco.com>
Merge "included the nodetype in the congruence check. also handled the condition where the node id is null."