CRM-13981, default data fixes

----------------------------------------
* CRM-13981:
  http://issues.civicrm.org/jira/browse/CRM-13981
Revert "CRM-13981, handling profile selector for mixed profile types in Edit and Copy case"

This reverts commit 13e4fbdd8df6c355ebb40e1ae63734ff6a5da10f.
Merge pull request #2383 from kurund/CRM-13981

CRM-13981, generated data fixes and reverted bad commit