Rbd ephemeral snapshot havana

these two recent commits will help address concerns with our RBD backed ephemeral instances.

Closes-rally-bug: DE758
Not-in-upstream: true