Issues #2357869 #2334093 - update commerce_discount and commerce_coupon