[WFLY-3249] Upgrade to JBoss Negotiation 2.3.0.Final
Fix problems from rebase on master