Merge branch 'dev-orcid-integration' into dev-AMEC-2259
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge remote-tracking branch 'origin/master' into dev-moodle-room
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge branch 'dev-orcid-integration' into dev-moodle-room
Some refactoring to support one time token authentication for password reset. AMEC-2258
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge branch 'dev-orcid-integration' into dev-moodle-room
Merge branch 'master' into dev-moodle-room
Altering method structure to be a bit more flexible AMEC-2262
Merge branch 'master' into dev-AMEC-2262
Merge branch 'master' into dev-moodle-room
Merge branch 'dev-moodle-room' into dev-AMEC-2262
Adding new model and data migration for user meta information
Merge branch 'master' into dev-AMEC-2262
Merge branch 'master' into dev-AMEC-2262
HttpResourceServer.serveResource was returning early based on headers such that cached content did not get reread. However the stream opened in FetchObjectAction was not closed before the return, so I closed it before returning.
Note this does not necessarilly cover all cases where it could be closed in this function.