Fix ActivityID getting not cleaned up properly

[peterbae]

Copy of #1020, except it's going into hotfix7.2.2 branch.

[codecov-io]

Codecov Report

Merging #1028 into hotfix7.2.2 will increase coverage by 0.33%.
The diff coverage is 25.77%.

@@                Coverage Diff                @@
##             hotfix7.2.2    #1028      +/-   ##
=================================================
+ Coverage          50.62%   50.96%   +0.33%     
- Complexity          2923     2978      +55     
=================================================
  Files                120      120              
  Lines              27987    27997      +10     
  Branches            4678     4686       +8     
=================================================
+ Hits               14169    14269     +100     
- Misses             11527    11536       +9     
+ Partials            2291     2192      -99

Flag	Coverage Δ	Complexity Δ
#JDBC42	50.5% <25.77%> (+0.31%)	2934 <16> (+50)	⬆️
#JDBC43	50.86% <25.77%> (+0.29%)	2976 <16> (+59)	⬆️

Impacted Files	Coverage Δ	Complexity Δ
...oft/sqlserver/jdbc/SQLServerPreparedStatement.java	53.41% <0%> (ø)	216 <0> (ø)	⬇️
...m/microsoft/sqlserver/jdbc/SQLServerStatement.java	61.29% <0%> (+0.28%)	144 <0> (+6)	⬆️
...soft/sqlserver/jdbc/SQLServerDatabaseMetaData.java	35.19% <0%> (ø)	66 <10> (ø)	⬇️
.../com/microsoft/sqlserver/jdbc/SQLServerDriver.java	81.61% <0%> (ø)	32 <0> (ø)	⬇️
...m/microsoft/sqlserver/jdbc/SQLServerException.java	73.52% <0%> (-3.92%)	32 <0> (ø)
...m/microsoft/sqlserver/jdbc/SQLServerResultSet.java	43.79% <0%> (-0.08%)	321 <0> (+2)
...c/main/java/com/microsoft/sqlserver/jdbc/Util.java	63.36% <100%> (+0.86%)	95 <0> (+4)	⬆️
...in/java/com/microsoft/sqlserver/jdbc/IOBuffer.java	57.96% <50%> (+2.18%)	0 <0> (ø)	⬇️
.../microsoft/sqlserver/jdbc/SQLServerConnection.java	47.18% <51.85%> (+0.67%)	365 <0> (+23)	⬆️
...m/microsoft/sqlserver/jdbc/ActivityCorrelator.java	78.37% <90%> (-15.91%)	9 <6> (+2)
... and 14 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5d592c0...d8e32cb. Read the comment docs.