Integrate rendition importing into archive_ingest feature
Merge remote-tracking branch 'adrian/master'