Support "free" country fields as well.

If both free and non-free country fields are defined in a source,
the "free" version will take precedence.

Request: 12192