Few fixes for new resteasy
Merge pull request #6121 from ctomc/rest

Few fixes for new resteasy