Merge "Bug 2086: Adding normalized node stream reader and writer."