Merge proposals dependent on lp://staging/~allenap/maas/bug-1458894-ioerror-during-image-download

1. bug-1458894-ioerror-during-image-download
2. Dependent merge proposals