Issue #2330057: Convert oa_discussion to a local app
Issue #2331097: Remove use of variable_set