CLOUDIFY-2120 - NPE when using the management machine for storage.