Merge "Update JJB file for smo/o1 to add support for release and Sonar run"