Fix race in FileSettingsServiceIT.testSettingsAppliedOnStart#134368

elasticsearchmachine merged 2 commits intoelastic:mainelastic/elasticsearch:mainfrom

mosche:tests/131210_FileSettingsServiceIT_testSettingsAppliedOnStartmosche/elasticsearch:tests/131210_FileSettingsServiceIT_testSettingsAppliedOnStartCopy head branch name to clipboard