#1158. fixes and enhancements to support State and Country pick lists being enabled in the org.