Promotion problems in 2.2.2

I have just upgraded to 2.2.2 and everything seems pretty much okay except that it seems to have affected the way promotions are applied.

I have some cart promotions that e.g. if a customer places 2 of the same fishing rods in their cart they get a 5% discount and if they buy 3 they get a 10% discount. Before the upgrade the promotions worked - the number of rods in the cart determined the promotion that was applied. Now if the customer orders 3 rods the cart is applying both the 2 rod discount and the 3 rod discount - i.e. giving much too big a discount.

Has anyone else experienced this? Any idea how to fix it?