Fixes in rbd-ephemeral-clone stable/icehouse branch