oo-accept-systems: fix errors from PR 5851

The cartridge consistency checks introduced in PR 5851 did not correctly
determine which cartridges were active on the broker, which becomes
apparent once you have imported more than one version of any cartridge.
Inactive versions of the cartridge could be compared against the node
versions. This is now fixed.

Also obsoletes were added to the list of things not to compare, and
probably some other issues addressed along the way.
Merge pull request #5854 from sosiouxme/oo-accept-systems-cartridge-integrity

Merged by openshift-bot
Add markers to disable bad ciphers for rhel6.6

https://bugzilla.redhat.com/show_bug.cgi?id=1127667
Merge pull request #5855 from bparees/bad_cipher_param

Merged by openshift-bot
node.conf: correct IP_ADDRESS_WRAPAROUND_OFFSET param

https://bugzilla.redhat.com/show_bug.cgi?id=1150186
Bug 1150186 - node.conf incorrectly indicates
WRAPAROUND_IP_ADDRESS_OFFSET

The default node.conf had a long section explaining what
IP_ADDRESS_WRAPAROUND_OFFSET is for and then provided
WRAPAROUND_IP_ADDRESS_OFFSET. The actual container looks at
IP_ADDRESS_WRAPAROUND_OFFSET. Correct node.conf.
Merge pull request #5856 from sosiouxme/bz1150186

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.31.4-1].
Automatic commit of package [openshift-origin-cartridge-jenkins] release [1.25.2-1].
Automatic commit of package [rubygem-openshift-origin-routing-activemq] release [0.6.2-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.30.3-1].
Automatic commit of package [openshift-origin-msg-node-mcollective] release [1.27.2-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.31.6-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.31.4-1].
Automatic commit of package [openshift-origin-broker-util] release [1.30.5-1].