Merge pull request #51 from pmorie/dev/cartridge_refactor

WIP: relax app repo assumptions about templates
Merge pull request #52 from pmorie/dev/cartridge_refactor

Fix lock/unlock functional tests
PHP setup/locked_files fixes.
Merge pull request #53 from mrunalp/dev/cartridge_refactor

PHP setup/locked_files fixes.
WIP: remove-cart test in mock-plugin.feature
WIP: mock-plugin remove