Make Collection's image_store required, as it's used by attachment upload
Merge branch 'collection-imagestore'

* collection-imagestore:
  Make Collection's image_store required, as it's used by attachment upload