Merge pull request #4546 from senivam/3.x

merge actual master into jakartified Jersey