CRM-15182 - on behalf of: preloaded org is not preserved

https://issues.civicrm.org/jira/browse/CRM-15182
------------------------------------------------------------------------
Also includes one notice fix for "Undefined index onbehalfof_id"