WIP: v2 snapshot/restore
Merge pull request #1874 from pmorie/dev/oo-snapshot

Merged by openshift-bot