SONAR-4898 improve (again) stability of WatcherThreadTest
Merge remote-tracking branch 'origin/branch-4.5'