Merge pull request #261 from ronsigal/Branch_2_3

Branch 2 3: RESTEASY-802
bz916799
Merge pull request #264 from liweinan/bz916799,Branch_2_3,revised

bz916799