Sync copyright fixes from downstream Emacs