Whiskey producer Popcorn Sutton has agreed to change the packaging for its namesake brand after striking a deal with Brown-Forman, following legal action from the Jack Daniel's firm.