Ensure that countries update for the forms that use them [MJ-700]

This was a display issue. The country was being saved correctly, but we were always displaying the default of "USA".

All tests pass.