Back-port of copyright changes to master

Diff based on PR #5654 (git diff a961e19..fd935cf), applied skipping unmatched files