added more character escapes for json

(cherry picked from commit 840f7b370686e06071913a7c235c5d92ae175fae)