Merge "Fix typos in Apex jjbs"