Merge "Update sl-os-contrail model to ocata"