[MNG-7312] Revert ThreadLocal approach from MNG-6843 and MNG-7251#595

michael-o wants to merge 1 commit intomaven-3.8.xapache/maven:maven-3.8.xfrom

MNG-7312-maven-3.8.xapache/maven:MNG-7312-maven-3.8.xCopy head branch name to clipboard