Subtotal is now above the shipping method price, then shipping method price and shipping method taxes are grouped for more logical
refs #767