MARMOTTA-440: Improved transaction handling
MARMOTTA-440: updated some wording from the spec, started patch implementation