Fix EnumVariable to return the value as unicode

Cast to unicode if the value comes as string

Change-Id: I4611d5546d622470fdc19710d04b8f6a40881943