Fix for getting GUID index in 2.2

Change-Id: Iaadd262c9b5ca5a05751ec6d5344f75cb01f4877
Signed-off-by: Itzik Brown <ItzikB@mellanox.com>