(Issue 930) Clear authz roles when discussion is deleted
trim leading and trailing whitespace on csv import
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
(IntermittentFailure) Try not adding timeouts directly to a socket connection
Merge pull request #960 from mrvisser/issue-960

Intermittent test failure: Email scheduling is not synchronized in tests
(FlickrPP) Use SSL for Flickr API requests
(FlickrPP) Make static image link HTTPS as well to avoid leaking the image access secrets
Merge pull request #963 from mrvisser/flickr-pp-ssl

(FlickrPP) Use SSL for Flickr API requests
Added the  key to the connection info for websockets
Merge branch 'if-push-timeout'

* if-push-timeout:
  Added the  key to the connection info for websockets
  (IntermittentFailure) Try not adding timeouts directly to a socket connection
Merge pull request #927 from stuartf/csvtrim

CSV import fields need trimming
Support youtu.be style URLs