Administrative roles support, fix administrator check - EUCA-8164

EUCA-8164