Updates the upgrade from https://github.com/civicrm/civicrm-core/pull/1348 to apply to the merged civi version