Adds resume image after direct_snapshot

I found this logic bug in the direct snapshot code. Tested in svl3
Also makes the snapshot of "type snapshot" so it shows up in the list
of "boot from snapshot"

Closes-rally-bug: DE1343
Not-in-upstream: true