Cherry pick branch 'genexuslabs:fix/strcmp-null-vs-empty' into beta

Author: iroqueta

common/src/main/java/com/genexus/CommonUtil.java

@@ -2809,7 +2809,7 @@ else if (className.equals("long") || className.equals("java.lang.Long") || class
         }
         else if (className.equals("string") || className.indexOf("java.lang.String") != -1)
         {
-            return objStr.equals("null") ? null : objStr;
+			return (obj == JSONObject.NULL)? null : objStr;
         }
         else if (className.equals("double") || className.equals("java.lang.Double") || className.equals("[D"))
         {

java/src/test/java/com/genexus/TestCommonUtil.java

@@ -295,7 +295,7 @@ public void testConvertObjectTo() {
 		try{
 			Class stringClass = Class.forName("java.lang.String");
 			result = CommonUtil.convertObjectTo(obj, stringClass, true);
-			Assert.assertEquals(null, result);
+			Assert.assertEquals("null", result);
 		} catch (Exception e){
 			Assert.fail("Test failed " + e);
 		}