transaction: Fix some issues
- commit bbfdm changes for all methods except set/add/delete only if the method is different to usp.raw and there is no transaction in progress
- revert bbfdm changes when calling transaction_abort()
- remove Omar's latest merge request