This directive throws a deprecation warning in apache 2.4
deployment_guide_comprehensive formatting and minor fix
Fix cart props split value
Bug 1063278 - kill user processes before user

	modified:   node-util/sbin/oo-admin-gear
Bug 1045224 - install iptables rules in new dir

install iptables.*.rules in /var/lib/openshift/.httpd.d instead of
/etc/openshift.

solve 'files listed twice' warning during rpmbuild for
rubygem-openshift-origin-node

	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 #4728 from lsm5/oo-admin-gear-test

Merged by openshift-bot
Merge pull request #4720 from lsm5/new-iptables2

Merged by openshift-bot
Bug 1063703: Assume ws if websocket is true.
<application model> select => compact

Me being dense. Where I said "select" I really wanted "compact" to
remove any nils (which would probably never be relevant, unless it
became possible to specify two framework cartridges, and the first one
didn't have a specified git repo but the second one did).
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.18.3-1].
Automatic commit of package [openshift-origin-cartridge-jenkins-client] release [1.18.3-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.20.3-1].
Automatic commit of package [rubygem-openshift-origin-frontend-apache-mod-rewrite] release [0.3.3-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.13.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossews] release [1.19.3-1].
Automatic commit of package [openshift-origin-cartridge-postgresql] release [1.20.3-1].
Automatic commit of package [rubygem-openshift-origin-admin-console] release [1.18.3-1].
Automatic commit of package [openshift-origin-cartridge-mock] release [1.16.3-1].
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.20.3-1].
Automatic commit of package [openshift-origin-cartridge-php] release [1.20.3-1].