Allow image and package to be specified
Merge branch 'master' into instanceconfig
Undo commenting I did for debugging