Bug #994. Correct lookup of picklist values for State and Country Code fields
Merge branch 'feature/994-state-country-picklists-fix' of github.com:force2b/Cumulus into feature/994-state-country-picklists-fix

Conflicts:
	src/classes/ADDR_Validator.cls