Merge "BUG 1848 : Use OrderedNormalizedNodeWriter in rpc transformation."