Bug #994: Modify code that updates the state and country fields on the Account and Contact object to first validate the value against the set of valid State and Country picklist codes/values, if that feature is enabled in the Org.
Merge remote-tracking branch 'upstream/dev' into feature/994-state-and-country-picklist-support
Bug #994: Add new label to package.xml
Bug #994: Fix grammatical error in label
Merge pull request #1129 from force2b/feature/994-state-and-country-picklist-support

Updates to allow address update code to work with State & Country picklists enabled
Merge pull request #1130 from SalesforceFoundation/feature/994-state-and-country-picklist-support

Updates to allow address update code to work with State & Country picklists enabled
Merge dev into feature/1045-ref-cumulusci