SetOccupied fix

SetOccupied should not manually set unless the city is being returned to
its original owner.
Merge remote-tracking branch 'origin/stable' into new-features