Fix for CRM-14354 - Additional gift breaks ARB (auto-renewing) memberships.

Fixed CRM-14354 in both the "separate membership payment" and the single-payment contexts.

----------------------------------------
* CRM-14354: Additional gift breaks ARB (auto-renewing) memberships
  https://issues.civicrm.org/jira/browse/CRM-14354