TEZ-1745. TestATSHistoryLoggingService::testATSHistoryLoggingServiceShutdown can be flaky. (hitesh)

(cherry picked from commit 71ca74e0e8e9e59dd1490961cc15482487cdbec8)

Conflicts:
	CHANGES.txt