Merge pull request #4198 from pks-t/pks/git-compat README: document our relation to changes in upstream