Merge pull request #182 from kaltura/IX-9.1.0-uiconfprodissue

Revert use of !$this->isUiConfContentSet in getConfFilePathImpl
Remove use of $subType as well
Merge pull request #185 from kaltura/IX-9.1.0-uiconfprodissue1

Ix 9.1.0 uiconfprodissue1