SI-7462 Replace j.l.* with j.l.{String,Class} import