Merge "Use default odl image for hwvtep jobs"