Bug 977950 - Copying the v1 descriptions back into the v2 versions of the cartridge.
Bug 979134 - the v1 cart version check was matching older versions of the v2 cart and is no longer necessary.
Merge pull request #2956 from rmillner/misc_bugs_stg

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.10.4-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.10.6-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [0.5.7-1].
Automatic commit of package [openshift-origin-node-util] release [1.10.5-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [0.5.5-1].
Automatic commit of package [openshift-origin-cartridge-python] release [0.5.7-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.10.6-1].
Merge pull request #2960 from jwhonce/stage

Merged by openshift-bot
[TO_STAGE] backport of marek's origin-server/pull/2949
Merge pull request #2964 from maxamillion/dev/maxamillion/stage_marek_acceptnode

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.10.7-1].
Automatic commit of package [openshift-origin-node-util] release [1.10.6-1].
Bug 977034 - Removing IDENT breaks destroy

* introduced error when logging error message