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
fix rubygem sources
Bug 912798
Merge pull request #1410 from danmcp/master

Bug 912798
Merge pull request #1408 from jwhonce/format_markers

Merged by openshift-bot
Merge pull request #1409 from tdawson/tdawson/fix_rubygem_sources

Merged by openshift-bot
Bug 906840
Merge pull request #1412 from bdecoste/master

Merged by openshift-bot
Fix permissions for db files.
Allow for a __default__ target which matches hosts not otherwise matched.
Move the broker-only configuration below node in priority.
Merge pull request #1414 from rmillner/US3143

Merged by openshift-bot
Bug 912899 - mcollective changing all numeric mongoid to BigInt

* Messages passed between the Broker and Node are assumed to contain
  all string args. All numeric mongoid's are being converted to BigInts.
  Add code to change them back to strings.
Relaxing restrictions on ssh key names
Merge pull request #1417 from jwhonce/dev/wip_master

Merged by openshift-bot
Merge pull request #1416 from abhgupta/abhgupta-dev

Merged by openshift-bot
The console should send a locked API version
Merge pull request #1419 from smarterclayton/console_should_send_api_version

Merged by openshift-bot
<oo-diagnostics> fix bug in District methods, redirect httpd broken version to kbase
Merge pull request #1422 from sosiouxme/diagnostics

Merged by openshift-bot