Don't assume we have a conflict if no base rev is known in EditEntity

Bug: 63009
Change-Id: I7990dec330210edb7065f0ccfa596cebb61f01bd
Merge "Don't assume we have a conflict if no base rev is known in EditEntity"