NBI changes for Grafana Multitenancy feature