Update repo with latest changes from egg version 1.4
Refs #22308 - Fix map.pt to work with Chameleon