(BugId: 95761) Wikiatracker Refactoring

Re: #363

The major changes: refactor old trackEvent calls to use the new track method which supports passing in all parameters as a hash. Added the tracking method "ad" for ad-related tracking calls (replaces the trackAdEvent functionality which was basically the original track event duplicated).