Merge "Upgrade global-jjb to v0.42.1-11-gf517210"