remove java-devel BuildRequires, move ROOT.war jar to configure
Fix for bug 918966
Removing constraints from routes and adding regex checks in controllers
remove java-devel BuildRequires, move ROOT.war jar to configure
remove java-devel BuildRequires, move ROOT.war jar to configure
Merge pull request #1656 from abhgupta/abhgupta-dev

Merged by openshift-bot
Merge pull request #1655 from bdecoste/master

Merged by openshift-bot
WIP Cartridge Refactor - Refactor V2CartridgeModel to use CartridgeRepository

* Update calls, tests, etc
WIP Cartridge Refactor - Introduce oo-admin-cartridge command

* Add command and update spec file
WIP Cartridge Refactor - Refactor V2CartridgeModel to use CartridgeRepository

* Update calls, tests, etc

Conflicts:
	node/test/functional/v2_cart_model_func_test.rb
WIP Cartridge Refactor - Mock plugin installed from CartridgeRepository
WIP Cartridge Refactor - Fix v2_cart_model_test