Log Message: regen patch-ao with less context lines to avoid $Id$ in the original file (using pkgdiff now) PR: 32233 by Peter Avalos