fix: Backport block tag preservation fix to 2.8.x (#1312)#1315

jasmith-hs wants to merge 6 commits intomaster-2.8.xHubSpot/jinjava:master-2.8.xfrom

jasmith_hubspot/backport-1312-2.8.xHubSpot/jinjava:jasmith_hubspot/backport-1312-2.8.xCopy head branch name to clipboard