CRM-12426
CRM-12416 also fix warnings when running regen

----------------------------------------
* CRM-12416: Database problems when installing Danish language as basic data set
  http://issues.civicrm.org/jira/browse/CRM-12416
Merge pull request #570 from dlobo/CRM-12416

CRM-12416 also fix warnings when running regen
Merge pull request #569 from yashodha/4.3

CRM-12426