Merge "Enable log shipping on all puppet-fdio jobs"