Merge branch '2.3.x' into 2.4.x

Author: lhotari

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/converters/JSONConverterTests.groovy

@@ -129,6 +129,19 @@ class JSONConverterTests extends AbstractGrailsControllerTests {
 
         assertEquals('{"line":"first line \\n second line"}', result.toString())
     }
+    
+    // GRAILS-11530
+    void testMoreStringsWithQuotes() {
+        def str = 'Hi, this is my "test"'
+        def json = new grails.converters.JSON([a:str])
+        assertEquals('{"a":"Hi, this is my \\"test\\""}', json.toString())
+        
+    }
+
+    // GRAILS-11517
+    void testMoreStringsWithQuotes2() {
+        assertEquals('{"key":"<a href=\\"#\\" class=\\"link\\">link<\\u002fa>"}',(['key': '<a href="#" class="link">link</a>'] as JSON).toString())
+    }
 
     void onSetUp() {
         GroovySystem.metaClassRegistry.removeMetaClass Errors