Merge "Enable log shipping on all vpp jobs"