Sync delivery to release290 for 29-rc3#9192

ebarboni wants to merge 2 commits intorelease290apache/netbeans:release290from

deliveryapache/netbeans:deliveryCopy head branch name to clipboard