Fix for #1010
Proper fix for #1010
Proper Fix for #992
Fix for #1009
More work toward make it work with jsr356
Make it work with basic path
Make sure the builder is not overriden
Fix jsr356
Clean up
Need a way to find how to support wildcard mapping, so for now add a hack
Make sure the queryString is only parse once
Fix for #1013
Fix for #1014
Fix for #962
Unwanted changed
One more fix for #962, improve error code
Grrr unwanted change
One more fix for #1014
Fix UUID handshake regression
Not required