Revert "editentity aliases only 1 changeop per change type"

This reverts commit 976a224aa388038250b3de5037750e1386360e3a.

Change-Id: I71c972c37ee45e73ddc8545a90c24fe465bf0b1d
Merge "Revert "editentity aliases only 1 changeop per change type""