Use separate header ID map local variables and logic for primary and secondary headers
Remove duplicate errata entry
Merge pull request #1132 from jhinkey/number-headers-6.1.x

Number headers 6.1.x