CRM-11917 On Behalf of Organization reserved profile Type should be Organization, Contact

The On Behalf of Organization profile is distributed with 'misleading' profile type setting of 'Organization, Contact, Contribution, Membership'. Since the default distribution only has Organization and Contact fields, the type should not include the membership and contribution (although it doesn't actually cause any problems in using the profile). Since type is updated dynamically when fields are added or removed in the profile, the type is 'reset' based on actual fields present which can be confusing (see original post).

Modify meta data (xml/templates/civicrm_data.tpl and civicrm_generated.mysql) for new installs to set type to Organization, Contact only.

— Original Post ----
Adding custom fields to On Behlaf of Profile (reserved) breaks its preset types
I added custom fields and now the profile has lost its preset types of 'Contact, Organization, Contribution, Membership'
and now has 'Organization, Contact' only.

Replicated on Joomla demo - see attached

Not sure if a bug or a 'feature' but sems like a bug from my point of view