update curator and fix test

curator is more strict now
update jetty
Merge pull request #916 from metamx/backport-update-jetty-curator

Backport update jetty curator