node-util: "conflicting TE rule" for openshift.pp

Fix problem seen in OpenShift Enterprise - not clear why not seen in
Online.

Bug 1155925 - error is seen when installing openshift-origin-node-util
https://bugzilla.redhat.com/show_bug.cgi?id=1155925
Merge pull request #5904 from sosiouxme/bz1155925

Merged by openshift-bot
Merge pull request #5908 from rajatchopra/master

Merged by openshift-bot
bz#1157863 - rubygem-openshift-origin-routing-daemon needs to set the file mode
Merge pull request #5911 from calfonso/bz1157863

Merged by openshift-bot
iptables-port-proxy: use -n on iptables -L

Since there's no evident need to have iptables perform reverse DNS
resolution on the entries in the tables, don't do that. It saves time
even when nothing is wrong with DNS config.

Bug 1156200 - oo-admin-ctl-iptables-port-proxy is needlessly slow under DNS failures
https://bugzilla.redhat.com/show_bug.cgi?id=1156200
Merge pull request #5912 from sosiouxme/bz1156200-port-proxy-iptables

Merged by openshift-bot
Use TLS for integration tests
Merge pull request #5913 from liggitt/site_extended_fixes

Merged by openshift-bot
Jenkins cart: Add "unzip" dependency

The `bin/install` script depends on `unzip` being in the path, so the
specfile for this package should Require the `unzip` package.

Enterprise bug 1136706
https://bugzilla.redhat.com/show_bug.cgi?id=1136706
Merge pull request #5914 from dobbymoodge/BZ1136706

Merged by openshift-bot
Fix malformed ENV VARs in Cron

Bug 1157830 - https://bugzilla.redhat.com/show_bug.cgi?id=1157830
Specifically require AsciiDoctor 0.1.4 to solve template error
Merge pull request #5916 from nhr/m4_docs_gen_fix

Merged by openshift-bot
bz 1116750
fix the description of command "aliases"
Merge pull request #5915 from VojtechVitek/bug_1157830

Merged by openshift-bot
Merge pull request #5917 from sztsian/master

Merged by openshift-bot
make the default crt/key/chain file to be configurable in vhost template