Update copyright notice

Fix whitespace in copyright headers

Make headers self-contained

Updated copyright

which included commits to RCS files with non-trunk default branches.