Merge branch 's3-ingest-arg' into 'master'

Rename S3 ingest argument from folder_id to element_id

See merge request !1283

vue/Imports/ImportFromBucket.vue

@@ -264,7 +264,7 @@ export default {
         element_type: this.elementType,
         folder_type: this.folderType
       }
-      if (this.folder) data.folder_id = this.folder.id
+      if (this.folder) data.element_id = this.folder.id
 
       try {
         const { id } = await this.fromBucket(data)