Merge "Convert -j to a reasonable parallelism for kati"