CRM-15453 - merge conflict fix on 4.6.alpha1.myql.tpl.

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