WIP: session cleanup
Make Collection's image_store required, as it's used by attachment upload
Merge branch 'session-cleanup'

* session-cleanup:
  Make Collection's image_store required, as it's used by attachment upload
  WIP: session cleanup