Sync delivery to master after 31-rc1#9518

ebarboni wants to merge 2 commits into

masterapache/netbeans:masterfrom

deliveryapache/netbeans:deliveryCopy head branch name to clipboard