[TEST] Concurrent update/delete.

Use semaphore.
Merge branch 'test/concurrentUpdateDelete' of github.com:GaelTadh/elasticsearch into test/concurrentUpdateDelete
Merge branch 'test/concurrentUpdateDelete' of github.com:GaelTadh/elasticsearch into test/concurrentUpdateDelete
Merge: resolve conflict