GH-2097/t2-to-utm-content-fix (#612) …
* Remove t2 code from Metrics * Add utm_content * Pacify linter * Modify ah comment in UpgradePlan Co-authored-by: Christopher Tino <4699516+christophertino@users.noreply.github.com>