Merge branch 'fix-tests'
Create archive-layout and use it in ingest/archive.

To have reusable layout, actions are set via activities and
filtered by data type.