Per #6527 / rP21441 discussion, the choice to reset the wonder timer when an ally is defeated is controversial. I side along with it seems a majority that it shouldn't be reset. This changes that.
There is also some weirdness in the diplomacy code: the timer isn't reset in last man standing when changing diplomacy, which seems broken.