(Issue 930) Clear authz roles when discussion is deleted
trim leading and trailing whitespace on csv import
(Issue 955) Replace all occurrences of - in random column name
Merge pull request #44 from Coenego/avocet-master-merge

Merged with latest Hilary master
Configuration update

- Moved the addedem url configuration to publications config
- Added configurable for the staff group ID
Merge pull request #955 from mrvisser/issue-955

Unit tests can generate invalid random column family names
Merge pull request #46 from Coenego/avocet-configuration-update

Configuration update
(Issue 957) Add logging for websocket connection authentication timeout
(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"
Merge pull request #957 from mrvisser/issue-957

Intermittent test failure "verify authentication timeout" in push notifications
Return the authentication strategy that was used during login
Moved the authentication strategy to the context

Added a test for the context locale setter
Exposing strategyId and not strategyName on the session for the signed strategy
Only sticking the auth strategy in the context when it is known
(Issue 960) Synchronize e-mail scheduling with activity delivery and email collection
Added an assertion that the correct discussion is returned in a discussion library test
Merge branch 'issue-930'

* issue-930:
  Added an assertion that the correct discussion is returned in a discussion library test
  (Issue 930) Clear authz roles when discussion is deleted
Merge remote-tracking branch 'simong/return-auth-strategy'
Turn 7.0-specific comment into a TODO to remove backward compatibility code