Merge branch 'optimizing-deployment' into 'develop'

Long expire only for layout stage and use layout artifacts only for deployment

See merge request !49
2 jobs for 62-improve-solr-indexing in 1 minute and 48 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #361
build

00:01:06

 
  Layout
passed #362
layout

00:00:42