Merge pull request #4752 from bparees/restore_test

Merged by openshift-bot
Bug 1064650 - oo-admin-ctl-cartridge handles bad input
Merge pull request #4754 from smarterclayton/activate_obsolete_carts

Merged by openshift-bot
Corrected MCollective log locations in comprehensive guide
Merge pull request #4755 from smarterclayton/bug_1064650_return_error_on_bad_input

Merged by openshift-bot
Fix for bug 1064838 and partial fix for bug 1064141
 - Setting comp_spec attributes for ha apps only if the app is ha
 - fixing a typo in variable name where 'gear' was used instead of 'g'
Bug 1064219 - handle iptables rules

Via rpm itself, copy over iptables rules configs and backups from
/etc/openshift to /var/lib/openshift/.httpd.d before installing
new files and delete old files after the upgrade.

also, do not delete *.rpmnew in %post

	modified:   node/rubygem-openshift-origin-node.spec
Fixes site_extended tests
Merge pull request #4756 from nhr/comprehensive_guide_corrections

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

Merged by openshift-bot
Merge pull request #4759 from lsm5/iptables-rules-new-spec

Merged by openshift-bot
Merge pull request #4760 from fabianofranz/master

Merged by openshift-bot
Configure-Order should influence API requires
Merge pull request #4753 from smarterclayton/make_configure_order_define_requires

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.18.5-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.20.5-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.20.4-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.20.5-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.20.5-1].
Automatic commit of package [openshift-origin-broker-util] release [1.20.4-1].