trim leading and trailing whitespace on csv import
(Issue 960) Synchronize e-mail scheduling with activity delivery and email collection
(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
(Release 7.1.0) Bump version
(Release 7.1.0) Remove shrinkwrap
#954 - Refresh authentication strategies on tenant updates
Merge pull request #954 from simong/954-refresh-tenants

Changing tenant host does not refresh authentication provider configurations that are dependent on tenant host