Corrected countryValidatorFactory name to be static string
Cleanups and upgrade to v.0.85.2