Fix the unit tests on MySQL by introducing a hack in ChangeOpsMerge

Based on code by Daniel Kinzler.

Change-Id: I31d065a2cd618ff0c785149afe1ae0779fdcd923
Merge "Fix the unit tests on MySQL by introducing a hack in ChangeOpsMerge"