defect fix as per dsc-432 and dsc-433
Merge remote-tracking branch 'origin/master' into dsc-432
minor update.
added staging of image file for reimaging.
added cleanup for reimaging.
Merge pull request #550 from nla/dsc-432

Dsc 432