Merge "Bug 1630: Updated normalized to binding codec to exclude LeafSetEntryNode."