Updates to geometry config in auto configuration
Update default geometry tag and add checks for data15->data21 in geometry tag logic. Addresses ATLASRECTS-6725
Update default geometry tag and add checks for data15->data21 in geometry tag logic. Addresses ATLASRECTS-6725