Pull state reporting changes into 1606_ox branch

This is not well documented, but we use "xx" as the default for unknown countries.  I think there might be a constant for this somewhere.  If not, we should set it up.