Commit d67edaff830e0f87a9b53bb4bbaf155bdc7ea499

DRC 2023-02-10T10:40:56

Ignore 2.1.5.1 ChangeLog header w/git diff --check (Otherwise, checkstyle flags it as a leftover conflict marker.)