Modified the query for activity options, renamed the global_option's table name to provider_option.
Modified the query for activity options, renamed the global_option's table name to provider_option.

oppatjala/mergetest