Test for etags fails since commit 4da38c63 when update-copyrights script inserted new lines into some of the test files. Including a patch that reverts added lines and adds a check to the script -- Mit Respekt, Vladimir Gorsunov