Merge "Modified getActiveAdminsForAffectedUser"