SSL Configuration : ssl.conf and openshift_origin_broker_proxy.conf conflict + assets ProxyPass (console icons)
SSL Configuration subsection
Bug 1057734 - Protect against divide by zero
wording about ssh configuration (mainly integrate nhr review/feedback)
Bug 1018342 - Stop restore/throttle flapping
Bug 1060290: Fix variable reference typo causing an exception
Merge pull request #4635 from jwhonce/bug/1057734

Merged by openshift-bot
Merge pull request #4634 from boly38/patch-4

Merged by openshift-bot
Merge pull request #4640 from jwhonce/bug/1018342

Merged by openshift-bot
Preventing multiple web proxies for an app to live on the same node
Merge pull request #4636 from ironcladlou/bz/1060290

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

Merged by openshift-bot