CRM-15258 - Also fixes CRM-15257. Includes new msg tpl versions and hand...

...les upgrades. New civicrm_generated.mysql as well. Also correcting syntax typos for singular versions of text in import summary templates.

----------------------------------------
* CRM-15258:
  https://issues.civicrm.org/jira/browse/CRM-15258
* CRM-15257:
  https://issues.civicrm.org/jira/browse/CRM-15257