CAPEDWARF-133 Rollback doesn't work when entity is obtained through a qu...

...ery and then modified