BZ-1118845: fix for EAP based Role mapping