Changes to Membership Renewal for issue CRM-20571