Merge pull request #4451 from senivam/jakartified.master

Jakartified.master - rebasing master on top of 3.x jakartification