[TIMOB-17233] Fix support for analytics custom url
Merge pull request #5863 from ayeung/timob-17233

[TIMOB-17233] Fix custom url issue for analytics