Add discount spec back in.
Merge branch '2-3-stable' of https://github.com/spree/spree_wombat into 2-3-stable