[TIMOB-15916] Fixed bug with analytics events not being properly formatted. This ticket also resolves [TIMOB-13630] and [TIMOB-13629].
Merge pull request #5133 from cb1kenobi/timob-15916_3_2_X

[TIMOB-15916] Fixed bug with analytics events not being properly formatt...