fixes
Merge remote-tracking branch 'upstream/master'
merge
Merge pull request #489 from patriot1burke/master

fixes
Merge pull request #488 from ronsigal/master

RESTEASY-1049
Fix issue with PathParam replacement in client proxy

Whenever a `PathParam` annotation contains a regexp, name replacement wasn't performed properly and resulted in URI malformed exception during `invoke` phase.

Replacement now properly deals with an optional path regexp.
Merge pull request #492 from ronsigal/master

RESTEASY-915: ResteasyProviderFactory.createHeaderDelegate() traverses
Merge pull request #491 from pdeschen/master

Fixes issue with PathParam replacement in client proxy
Added fix for issue 495 - https://github.com/resteasy/Resteasy/issues/495
[RESTEASY-779] DataSourceProvider does not properly read InputStream
Add ChannelHandlerContext to Resteasy for Netty4. Cf. #483
Merge pull request #499 from ajlyon/features/channel-context-netty4

Add ChannelHandlerContext to Resteasy for Netty4.
Merge pull request #497 from kylape/resteasy-779

[RESTEASY-779] DataSourceProvider does not properly read InputStream
Merge pull request #496 from hypnopadge/Fix-for-issue-495

Added fix for issue 495 - https://github.com/resteasy/Resteasy/issues/49...