Fixed copyrights to please repoman
Merged Heather's fix with copyright update