Tommy Edman set to make his long-awaited Dodger return