A merger between Buffalo Trace and the company behind Jack Daniel’s is back in play—and it could reshape how American whiskey is made, marketed and found.