Brewers' shaky deal with ex-Yankees star gets resolution