Cherry pick branch 'genexuslabs:fix/ajax-null-image' into beta

Author: iroqueta

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

@@ -854,11 +854,7 @@ public static boolean dateCompare( Date left , Date right)
    	public static int strcmp( String left ,
                              String right )
    	{
-		return Comparator.nullsFirst(String::compareTo)
-			.compare(
-				left  == null ? null : rtrim(left),
-				right == null ? null : rtrim(right)
-			);
+		return rtrim(left).compareTo(rtrim(right));
 	}
 
    	public static boolean strcmp2( String left ,

java/src/main/java/com/genexus/internet/HttpContext.java

@@ -727,7 +727,7 @@ public String getBuildNumber(int buildN){
 	public String convertURL(String file)
 	{
 		String url = "";
-		if (file.equals(""))
+		if (file == null || file.equals(""))
 		{
 			return "";
 		}