Bug 966462 - Support V1 and V2 cartridge formats

* Updated to use either OPENSHIFT_DIY_IP or OPENSHIFT_INTERNAL_IP
Merge pull request #1 from openshift/bug/966462

Bug 966462 - Support V1 and V2 cartridge formats