reference to $folder instead of $this->dropFolder
Merge branch 'IX-9.2.0' of https://github.com/kaltura/server into IX-9.2.0