CRM-15681 Merge sub-types

Merge sub-types, don't display sub-types in merge UI
Remove unneeded code for displaying sub-types
Merge pull request #4664 from aydun/CRM-15681-master

CRM-15681 Merge sub-types