Cleanup some code
Merge branch 'dns-cache-manager-impr' of https://github.com/Blazemeter/jmeter into dns-cache-manager-impr
Refactoring DNS Cache  Manager