Some hot-fixes that were merged to IX-9.17.0.
Merge pull request #1350 from kaltura/IX-9.18.0-url-managers-phase-2

Some hot-fixes that were merged to IX-9.17.0.