For master

Here are some changes to allow importing ubuntu mini-iso's, and other fixes. I'll test with debian netboot iso's later.