WIP Cartridge Refactor

* Add support for v1_cartridge_format/v2_cartridge_format markers in /var/lib/openshift/.settings
* Cleanup Sdk class
* Update application_container to read marker files
* Cleanup application container tests
Bug 912798
Merge pull request #1410 from danmcp/master

Bug 912798
Merge pull request #1408 from jwhonce/format_markers

Merged by openshift-bot