Switch back to using diskimage-builder from git

Also adds cherry picks for important fixes