Upgrade to latest hydra-jetty master