fix(controller): don't set original-image annotation when image is not rewritten + storage driver fixes

fix(controller): don't set original-image annotation when image is not rewritten + storage driver fixes #637