WIP Cartridge Refactor - rhcsh support of v2 applications

* Refactor rhcsh to make v2 cartridges fully supported