Fixing snapshot/restore and status reporting
Merge pull request #2033 from calfonso/master

Fixing snapshot/restore and status reporting