Merge pull request #58 from monishdeb/discount-fixes

CRM-14653 fix for autoDiscount break on Membership Type
Merge pull request #59 from monishdeb/discount-fixes

minor change
CRM-14653 fix