new dynamic enum
bulk upload changes re-merge
Merge branch 'master' of https://github.com/kaltura/server