Merge "fix unnecessary (and erroneous) use of jutil.JString"