Merge pull request #11536 from mattwire/CRM-21671_abstract_core_task