Rename cancel to revert in editor
Add cancel operation that throws away the current edit session after confirmation
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x