driver_restapi: support for both OS and VM images (#13 fix).