VE-652: fix tracking

https://wikia-inc.atlassian.net/browse/VE-652

This commit only introduces some of the tracking we had previously. The remainder of the tracking (and most of the stuff here) will be done upstream and pulled down later.