Merge "Switch to use global-jjb version of clm and sonar"