CRM-15073 : fix overwrite of subtype for onbehalf org

CRM-15073 : fix overwrite of subtype for onbehalf org