bugzids 3918, 3944: iso support when making images and removed lookup of parent template
fixed potential NPEs
Merge pull request #65 from daniellemayne/develop

Develop - partial iso support and bug fixes 3918, 3944