More fixes.
Merge branch 'test/concurrentUpdateDelete' of github.com:GaelTadh/elasticsearch into test/concurrentUpdateDelete