SD-322 : Store content from Ingest into the Content Archive

Fixed some merge generated issues