[Backport 2.x] Fixing dynamic tenancy changes for issues 1412 (#1419)#1458

cwperks merged 3 commits intoopensearch-project:2.xopensearch-project/security-dashboards-plugin:2.xfrom

DarshitChanpura:backport/backport-1419-to-2.xDarshitChanpura/security-dashboards-plugin:backport/backport-1419-to-2.xCopy head branch name to clipboard