CRM-15681 Merge sub-types

Merge sub-types, don't display sub-types in merge UI
Remove unneeded code for displaying sub-types

(Same as PR 4661 but against master branch)