Fix osdf jenkin merge jobs