CRM-13814

We are using/need option_group_id for getting group name for a logic of domain id groups.

so did appropriate modification to accomplish above as well as managing only updates to option value by using only 'id' of option value.

added test cases for the fix.