Merge "Switch EditForm to using editRevId in place of edittimestamp"