Pull upstream changes from commerce_promotion#3

jacobembree wants to merge 4 commits into

lisastreeter:masterlisastreeter/commerce_fee:masterfrom

jacobembree:fixesjacobembree/commerce_fee:fixesCopy head branch name to clipboard