Bug 3363 and 3408

I'm bundling these two issues together in one branch, because spec for #3363 was dependent on the fix for #3408.  This fixes `ActiveRecord::StaleObjectError` with `Address` `Email` and `Telephone`, but not with `Response`.  If it's indeed a problem, maybe it should get its own ticket since it's not likely related to #3363.