Merge pull request #3357 from bensze01/license-2.16

[2.16] Update license headers to reflect the Apache-2.0 OR GPL-2.0-or-later licensing