Merge "Enable log shipping on all honeycomb jobs"