JBIDE-17453 b2x maint

A necessary patch until JBIDE-17453 is finished upstream at jboss.org