Merge pull request #1872 from pmorie/dev/gear

Merged by openshift-bot
WIP: v2 snapshot/restore