part of a fix to #2716 error in discovery plugin menu and user without provisioning permissionsthe other part is a fix to the discovery plugin.(cherry picked from commit f039437bf004b2ddecea12f24219ba1cb2d5136c)
part of a fix to #2716 error in discovery plugin menu and user without provisioning permissions
the other part is a fix to the discovery plugin.
(cherry picked from commit f039437bf004b2ddecea12f24219ba1cb2d5136c)