Sync delivery to release310 for 31-rc1#9517

ebarboni wants to merge 2 commits into

release310apache/netbeans:release310from

deliveryapache/netbeans:deliveryCopy head branch name to clipboard