Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev