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

[TIMOB-17233] Fix custom url issue for analytics