incorporate xmvn/ivy fix; jetty8 conversion