Renamed noteValue xml prop back to just note
Only use cdata when "opting in" in xml conversion