Bug 1065243: fixing invalid mongo query attribute
cleanup
Allow new HA app to be created successfully

update_cluster previously assumed that there was always an initial proxy
gear, and that when adding a new proxy gear, it would always be an
increase from e.g. 1 to 2 or more.

Fix update_cluster so it will work correctly when a brand new app is
created with ha=true, in which case the initial call to update_cluster
will contain 2 proxy entries
Bug 1064219 - revert iptables location change

migration wasn't clean enough, so reverting back until there's a cleaner
solution

	modified:   common/bin/oo-diagnostics
	modified:   node/misc/bin/oo-iptables-port-proxy
	modified:   node/misc/sbin/oo-admin-ctl-iptables-port-proxy
	modified:   node/rubygem-openshift-origin-node.spec
Merge pull request #4765 from abhgupta/abhgupta-dev

Merged by openshift-bot
httpd cartridges: OVERRIDE with custom httpd conf

bug 1065533
https://bugzilla.redhat.com/show_bug.cgi?id=1065533
Implementation of bz 1054918 was intended to allow sysadmins to
override cartridges confs if needed. It didn't. This does.
Bug 1065318 - Multiplier overrides lost during deserialization
Merge pull request #4768 from danmcp/master

Merged by openshift-bot
Bug 1055356 - Man page and help fixes
Bug 1055475 - Mark require_district = true when zones are required in rpc_find_all_available

Fix application functional test
Merge pull request #4770 from lsm5/revert-iptables-dir

Merged by openshift-bot
Merge pull request #4771 from sosiouxme/custom-httpd-confs

Merged by openshift-bot
Merge pull request #4772 from smarterclayton/bug_1065318_multiplier_lost

Merged by openshift-bot
Merge pull request #4773 from danmcp/master

Merged by openshift-bot
Bug 1065264 - Better error handling on status
Merge pull request #4769 from ncdc/new-ha-app-fix-update-cluster

Merged by openshift-bot
Merge pull request #4767 from pravisankar/dev/ravi/bug1055475

Merged by openshift-bot
Merge pull request #4775 from danmcp/master

Merged by openshift-bot