--CRM-14191, fixed the upgrade code and also added upgrade code to updat...

...e civicrm_option_value.value for batch_status and batch_mode