Merge pull request #4456 from senivam/jakartified.m2

Jakartified modifications for 3.0.0-M2 release