WIP Cartridge Refactor - Move OPENSHIFT_NAMESPACE to v2 code path

* unix_user impacts both v1 and v2