Fix bug 963286: remove uservars from v2
Merge pull request #2528 from pmorie/bugs/963286

Merged by openshift-bot
WIP Cartridge Refactor - Allow CartridgeRepository#instantiate_cartridge overlay existing cartridge

* Support for fast migrations
Merge pull request #2530 from jwhonce/wip/v2v2_migration

Merged by openshift-bot
refix 961904
no need for semicolon check
Merge pull request #2531 from rajatchopra/master

Merged by openshift-bot