bz916799
Merge pull request #254 from ronsigal/Branch_2_3

Branch_2_3: RESTEASY-767
Merge pull request #257 from liweinan/BZ916799,B23

bz916799,Branch_2_3
Merge branch 'Branch_2_3' of https://github.com/resteasy/Resteasy into Branch_2_3