Merge "Update JJB template for smo-ves"