Change from BSD 2-Clause to dual BSD-2 and zlib