CLC-2780 and CLC-2757: Include last modified time and hash in merged feeds

JIRAs: https://jira.media.berkeley.edu/jira/browse/CLC-2757 and https://jira.media.berkeley.edu/jira/browse/CLC-2780

This is just the server-side fix -- both JIRAs need some client-side followup.