Fix mergeExecutorThreadCount in ThreadPoolMergeExecutorServiceDiskSpaceTests#134852

lkts merged 2 commits intoelastic:mainelastic/elasticsearch:mainfrom

lkts:fix_131982lkts/elasticsearch:fix_131982Copy head branch name to clipboard