Initial changes to drop suffix from header id's.
Update to ant number-headers task to eliminate suffix.