Post code review Updates
Merge pull request #403 from kaltura/IX-9.4.0-move-category

Post code review Updates