revert
revert
Revert "entity_translation unique id fix"

This reverts commit 4c7742c11ee5f71bdf91e1b96a5fa9d93f0c976d.
merge
fixes