3.5 maintenance - Fix for copyright updates
6 files changed