Merge "Too much merging. Revert "Bumping jb cts and cts verifier version."" into jb-dev