Merge changes from release26.6-SNAPSHOT through v7.40.1#2013

cnathe merged 4 commits into

developLabKey/labkey-ui-components:developfrom

fb_mergeFrom266v1LabKey/labkey-ui-components:fb_mergeFrom266v1Copy head branch name to clipboard