remove unused imports
update curator and fix test

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

Update curator + jetty