--CRM-14191, fixed the upgrade code and also added upgrade code to update civicrm_option_value.value for batch_status and batch_mode
fix function signature to match interface & not give warning
fix trailing spaces (whitespace issue)
Merge pull request #2764 from eileenmcnaughton/static_warnings

Static warnings
Merge pull request #2760 from pradpnayak/CRM-14191

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