Update to elasticsearch 1.1.1

(Impact only on tests as test framework moved a bit)

(cherry picked from commit e5a32c0)