Former All-Star Markakis to Rejoin Atlanta Braves