Copyright updates Batch 2 of 3
First batch of copyright updates
Completed #5359
Fixed #5178Removed errant "break"
Merge branch 'master' into bootstrap