Merge "fixes for sl_os_contrail cluster model"