Update JBoss marshalling and Apache httpclient