Merge "Made DB rollback() method properly bail out if no trx is active"