During settlement: due to rounding, if the re-calculated marginal price is the same as the previous marginal price, the marginalBidId would not be set and would prevent a legitimate bidder from claiming payout. This fixes that in different branches of settlement: below minimum price, last bid and capacity exceeded.
Tests are added for both settlement and bid claiming