Merge "Fix duplicate node and missing nodes in sl_os_contrail model"