Merge "Bug 1437, Bug 1438 NormalizedNode Stream Writer API and Implementation"