OS-1941: 'imgadm import UUID' broken, and make check