Merge "Enable log shipping on all nsh_sfc jobs"