Merge "Enable log shipping on all hc2vpp jobs"