Cleanup some license headers
Fix pear bug #20274
Also see 21ce607014ae3445147be2e52ceacdca0ca7b503