Retain both the original deferred words and their bases, and expose them with separate methods#1270

jasmith-hs merged 1 commit intomasterHubSpot/jinjava:masterfrom

track-bases-and-wordsHubSpot/jinjava:track-bases-and-wordsCopy head branch name to clipboard