Do not call upper on a profile country code of None

@wedaly and @dianakhuang, could you take a look at this?

@dmitchell, this PR contains the fix for the embargo issues in the RC.