(Issue 956) Ensure activity collection poller is disabled when refreshing activity configuration
Merge pull request #956 from mrvisser/issue-956

Intermittent test failure "verify aggregation respects email preference"