EZP-21599: changed the on-interrupt structure

Moved the body key to the operation itself, instead of the trigger,
and made sure that commitTransaction() will only commit if there *is*
a transaction going on.