Merge pull request #551 from ronsigal/Branch_2_3_new

Branch 2 3 new
resteasy1091 bz1130439
Merge pull request #564 from liweinan/resteasy1091

RESTEASY1091 BZ1130439