CLOUDIFY-2393-Storage-Impl-Phase-2