CRM-15453 - another merge conflict fix on generated.mysql

----------------------------------------
* CRM-15453:
  https://issues.civicrm.org/jira/browse/CRM-15453