CRM-15086 upgrade fix

----------------------------------------
* CRM-15086: civicrm_data.tpl: batch types, status, etc option values were mistakenly put in {ts}
  https://issues.civicrm.org/jira/browse/CRM-15086
Merge pull request #4057 from monishdeb/CRM-15086

CRM-15086 upgrade fix