technical merge for release branch 2.1.2#397

lukasj merged 3 commits into

jakartaee:masterjakartaee/jsonp-api:masterfrom

senivam:master_2.1.2senivam/jsonp:master_2.1.2Copy head branch name to clipboard