Merge "Enable log shipping on all tldk jobs"