Fix to unhappiness being unfairly applied to cities

[ambro-mlody]

When units are merged, there is kill delay and ai can in the meantime create city to which there is then unhappiness applied from reducing garrison.