Feature/1158 state country picklists

This pull request should not be accepted until @ceiroa has a chance to look at the "hack" to TDTM and error handling.  Carlos, look specifically at code that references to isPropogateErrorsFromTrigger.
You may have removed the only references to this method. The method was created by @force2b, maybe he can tell us if we still need it.