Updating some more copyright notices.
Merge branch 'refs/heads/hotfix-notice' into ARC/master