[Backport 2.x] Misc changes for tests

[opensearch-trigger-bot]

Backport a870b40 from #4171.

[peternied]

@willyborankin Could you looking to the test failures and create issues if we don't have them already? Failures seem to be related to ports that are already in use / not freed correctly.

[willyborankin]

Failures are not relevant to changes both failed due to:
BindException(Address already in use (Bind failed)), ldapSDKVersion=4.0.14, revision=c0fb784eebf9d36a67c736d0428fb3577f2e25bb').

Not sure what is the problem in this particular case.

[willyborankin]

Created issue: #4185

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.77%. Comparing base (1de1775) to head (686ad1f).

Additional details and impacted files

@@            Coverage Diff             @@
##              2.x    #4184      +/-   ##
==========================================
- Coverage   65.79%   65.77%   -0.02%     
==========================================
  Files         296      296              
  Lines       21082    21082              
  Branches     3456     3456              
==========================================
- Hits        13870    13867       -3     
- Misses       5482     5486       +4     
+ Partials     1730     1729       -1     

see 3 files with indirect coverage changes