Should be in the "quit" submenu, I think the logic that built the option was faulty indeed. Try the latest images, except for RPi2 which I haven't updated yet. I will build it with vc4 driver and Wayland in time.
Same issue I'm afraid, Kodi not visible from shutdown menu. Tried your VMWare image though to test with.