Rename variables for consistency

Signed-off-by: John Else <john.else@citrix.com>
Blank the vdi's sm_config on copy

Signed-off-by: John Else <john.else@citrix.com>
Minor fixes to some of the storage helper functions

Signed-off-by: John Else <john.else@citrix.com>