Merge "Fix the sdnc groovy" into casablanca