Merge pull request #5339 from Wikia/VID-2127

VID-2127 Add support for Maker Studios ingestion, clean up VideoIngestion code