Fix non admin logouts#8065

yadvr merged 2 commits intoapache:4.18apache/cloudstack:4.18from

shapeblue:FixNonAdminLogoutsshapeblue/cloudstack:FixNonAdminLogoutsCopy head branch name to clipboard