changes to support --noupdate flag on genimage
Merge branch 'bug3963'