SOAP-2360 Carriage returns now maintained accross saves
(cherry picked from commit 1668800)
SOAP-2360 Ensured escaped carriage return ("\r") is preserved too