Attempt to backpoart 94295

Trying to get the rbd clone functionality in Icehouse