Merge "Enable log shipping on all csit jobs"